Skip to content

Commit

Permalink
common: fix Coverity builds
Browse files Browse the repository at this point in the history
Patch the Coverity script.
Recently, this script regularly exits with an error, even though
the build is successfully submitted.  Probably because the status code
is missing in response, or it's not 201.

Changes:
1) change the expected status code to 200 and
2) print the full response string.

This change should be reverted when the Coverity script is fixed.
  • Loading branch information
ldorau committed May 7, 2018
1 parent 64014a3 commit 7b103fd
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
27 changes: 27 additions & 0 deletions utils/docker/0001-travis-fix-travisci_build_coverity_scan.sh.patch
@@ -0,0 +1,27 @@
From b5179dc4822eaab192361da05aa95d98f523960f Mon Sep 17 00:00:00 2001
From: Lukasz Dorau <lukasz.dorau@intel.com>
Date: Mon, 7 May 2018 12:05:40 +0200
Subject: [PATCH] travis: fix travisci_build_coverity_scan.sh

---
travisci_build_coverity_scan.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travisci_build_coverity_scan.sh b/travisci_build_coverity_scan.sh
index ad9d4afcf..562b08bcc 100644
--- a/travisci_build_coverity_scan.sh
+++ b/travisci_build_coverity_scan.sh
@@ -92,8 +92,8 @@ response=$(curl \
--form description="Travis CI build" \
$UPLOAD_URL)
status_code=$(echo "$response" | sed -n '$p')
-if [ "$status_code" != "201" ]; then
+if [ "$status_code" != "200" ]; then
TEXT=$(echo "$response" | sed '$d')
- echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
+ echo -e "\033[33;1mCoverity Scan upload failed: $response.\033[0m"
exit 1
fi
--
2.13.6

16 changes: 13 additions & 3 deletions utils/docker/run-coverity.sh
Expand Up @@ -57,9 +57,19 @@ cd $WORKDIR

# Run the Coverity scan

# XXX: Modify the script to print the full response string.
# XXX: Patch the Coverity script.
# Recently, this script regularly exits with an error, even though
# the build is successfully submitted. Probably because the status code
# is missing in response, or it's not 201.
curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | \
sed 's/\$TEXT/\$response/' | bash
# Changes:
# 1) change the expected status code to 200 and
# 2) print the full response string.
#
# This change should be reverted when the Coverity script is fixed.
#
# The previous version was:
# curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | bash

wget https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh
patch < utils/docker/0001-travis-fix-travisci_build_coverity_scan.sh.patch
bash ./travisci_build_coverity_scan.sh

0 comments on commit 7b103fd

Please sign in to comment.