From 32b031c555924917eeaa7ff3f40d479421b39565 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 15 Jul 2024 06:56:03 -0400
Subject: [PATCH] Fix detection of Coverity archive path in scan script.
(#18112)
---
packaging/utils/coverity-scan.sh | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/packaging/utils/coverity-scan.sh b/packaging/utils/coverity-scan.sh
index 877919e966..ebb82102d5 100755
--- a/packaging/utils/coverity-scan.sh
+++ b/packaging/utils/coverity-scan.sh
@@ -27,9 +27,6 @@
# this includes the token, so the default is not to print it.
# COVERITY_SUBMIT_DEBUG=1
#
-# Override the standard coverity build version we know is supported
-# COVERITY_BUILD_VERSION="cov-analysis-linux64-2019.03"
-#
# All these variables can also be exported before running this script.
#
# If the first parameter of this script is "install",
@@ -160,30 +157,21 @@ scanit() {
}
installit() {
- ORIGINAL_DIR="${PWD}"
TMP_DIR="$(mktemp -d /tmp/netdata-coverity-scan-XXXXX)"
progress "Downloading coverity in ${TMP_DIR}..."
- cd "${TMP_DIR}"
+ (cd "${TMP_DIR}" && debugrun curl --remote-name --remote-header-name --show-error --location --data "token=${token}&project=${repo}" https://scan.coverity.com/download/linux64)
- debugrun curl --remote-name --remote-header-name --show-error --location --data "token=${token}&project=${repo}" https://scan.coverity.com/download/linux64
+ COVERITY_ARCHIVE="$(find "${TMP_DIR}" -maxdepth 1 -mindepth 1 -name 'cov-analysis-linux64-*.tar.gz')"
- if [ -z "${COVERITY_BUILD_VERSION}" ]; then
- COVERITY_ARCHIVE="$(find "${TMP_DIR}" -maxdepth 1 -mindepth 1 -name 'cov-analysis-linux64-*.tar.gz' | cut -f 2 -d '/' | head -n 1)"
- else
- COVERITY_ARCHIVE="${TMP_DIR}/${COVERITY_BUILD_VERSION}.tar.gz"
- fi
-
- if [ -f "${COVERITY_ARCHIVE}" ]; then
+ if [ -n "${COVERITY_ARCHIVE}" ] && [ -f "${COVERITY_ARCHIVE}" ]; then
progress "Installing coverity..."
- cd "${INSTALL_DIR}"
-
- run sudo tar -z -x -f "${COVERITY_ARCHIVE}" || exit 1
+ run sudo tar -z -x -f "${COVERITY_ARCHIVE}" -C "${INSTALL_DIR}"
rm -f "${COVERITY_ARCHIVE}"
COVERITY_PATH=$(find "${INSTALL_DIR}" -maxdepth 1 -name 'cov*linux*')
- export PATH=${PATH}:${COVERITY_PATH}/bin/
- elif find . -name "*.tar.gz" > /dev/null 2>&1; then
- ls ./*.tar.gz
- fatal "Downloaded coverity tool tarball does not appear to be the version we were expecting, exiting."
+ export PATH="${PATH}:${COVERITY_PATH}/bin/"
+ elif find "${TMP_DIR}" -name "*.tar.gz" > /dev/null 2>&1; then
+ ls "${TMP_DIR}"/*.tar.gz
+ fatal "Downloaded coverity tool tarball does not appear to be the file-name we were expecting, exiting."
else
fatal "Failed to download coverity tool tarball!"
fi
@@ -195,7 +183,6 @@ installit() {
fi
progress "Coverity scan tools are installed."
- cd "$ORIGINAL_DIR"
# Clean temp directory
[ -n "${TMP_DIR}" ] && rm -rf "${TMP_DIR}"