[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 7/8] run-coverity-scan: download tools outside the container
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 7/8] run-coverity-scan: download tools outside the container |
Date: |
Thu, 21 May 2020 08:45:34 -0400 |
This lets us look at coverity_tool.md5 across executions of run-coverity-scan
and skip the download.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
scripts/coverity-scan/coverity-scan.docker | 3 +-
scripts/coverity-scan/run-coverity-scan | 42 +++++++++++-----------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/scripts/coverity-scan/coverity-scan.docker
b/scripts/coverity-scan/coverity-scan.docker
index 6f0460b66c..efcf63224d 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -127,5 +127,6 @@ RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
ENV PATH $PATH:/usr/libexec/python3-sphinx/
ENV COVERITY_TOOL_BASE=/coverity-tools
+COPY coverity_tool.tgz coverity_tool.tgz
+RUN mkdir -p /coverity-tools/coverity_tool && cd /coverity-tools/coverity_tool
&& tar xf /coverity_tool.tgz
COPY run-coverity-scan run-coverity-scan
-RUN ./run-coverity-scan --update-tools-only --tokenfile /work/token
diff --git a/scripts/coverity-scan/run-coverity-scan
b/scripts/coverity-scan/run-coverity-scan
index 6bb38b4f48..8bff952bf5 100755
--- a/scripts/coverity-scan/run-coverity-scan
+++ b/scripts/coverity-scan/run-coverity-scan
@@ -116,15 +116,17 @@ update_coverity_tools () {
echo "Downloaded tarball didn't match md5sum!"
exit 1
fi
- # extract the new one, keeping it corralled in a 'coverity_tool'
directory
- echo "Unpacking coverity build tools..."
- mkdir -p coverity_tool
- cd coverity_tool
- tar xf ../coverity_tool.tgz
- cd ..
- mv coverity_tool.md5.new coverity_tool.md5
- fi
+ if [ "$DOCKER" != yes ]; then
+ # extract the new one, keeping it corralled in a 'coverity_tool'
directory
+ echo "Unpacking coverity build tools..."
+ mkdir -p coverity_tool
+ cd coverity_tool
+ tar xf ../coverity_tool.tgz
+ cd ..
+ mv coverity_tool.md5.new coverity_tool.md5
+ fi
+ fi
rm -f coverity_tool.md5.new
}
@@ -296,6 +298,14 @@ if [ -z "$COVERITY_EMAIL" ]; then
COVERITY_EMAIL="$(git config user.email)"
fi
+# Otherwise, continue with the full build and upload process.
+
+check_upload_permissions
+
+if [ "$UPDATE" != no ]; then
+ update_coverity_tools
+fi
+
# Run ourselves inside docker if that's what the user wants
if [ "$DOCKER" = yes ]; then
# Put the Coverity token into a temporary file that only
@@ -315,13 +325,13 @@ if [ "$DOCKER" = yes ]; then
if [ "$UPDATE" != no ]; then
# build docker container including the coverity-scan tools
echo "Building docker container..."
- # TODO: This re-downloads the tools every time, rather than
- # caching and reusing the image produced with the downloaded tools.
+ # TODO: This re-unpacks the tools every time, rather than caching
+ # and reusing the image produced by the COPY of the .tgz file.
# Not sure why.
tests/docker/docker.py --engine ${DOCKER_ENGINE} build \
-t coverity-scanner -f
scripts/coverity-scan/coverity-scan.docker \
- -v "$SECRETDIR:/work" \
- --extra-files scripts/coverity-scan/run-coverity-scan
+ --extra-files scripts/coverity-scan/run-coverity-scan \
+ "$COVERITY_TOOL_BASE"/coverity_tool.tgz
fi
echo "Archiving sources to be analyzed..."
./scripts/archive-source.sh "$SECRETDIR/qemu-sources.tgz"
@@ -352,14 +362,6 @@ if [ "$DOCKER" = yes ]; then
exit 0
fi
-# Otherwise, continue with the full build and upload process.
-
-check_upload_permissions
-
-if [ "$UPDATE" != no ]; then
- update_coverity_tools
-fi
-
TOOLBIN="$(cd "$COVERITY_TOOL_BASE" && echo
$PWD/coverity_tool/cov-analysis-*/bin)"
if ! test -x "$TOOLBIN/cov-build"; then
--
2.26.2
- [PATCH v2 0/8] run-coverity-scan: misc improvements, especially for docker mode, Paolo Bonzini, 2020/05/21
- [PATCH v2 2/8] docker.py/build: support binary files in --extra-files, Paolo Bonzini, 2020/05/21
- [PATCH v2 4/8] run-coverity-scan: use docker.py, Paolo Bonzini, 2020/05/21
- [PATCH v2 1/8] docker.py/build: support -t and -f arguments, Paolo Bonzini, 2020/05/21
- [PATCH v2 7/8] run-coverity-scan: download tools outside the container,
Paolo Bonzini <=
- [PATCH v2 3/8] run-coverity-scan: get Coverity token and email from special git config section, Paolo Bonzini, 2020/05/21
- [PATCH v2 8/8] run-coverity-scan: support --update-tools-only --docker, Paolo Bonzini, 2020/05/21
- [PATCH v2 6/8] run-coverity-scan: use --no-update-tools in docker run, Paolo Bonzini, 2020/05/21
- [PATCH v2 5/8] run-coverity-scan: add --no-update-tools option, Paolo Bonzini, 2020/05/21