From 5ab3cce20c21b4b5a9090e414e25a159a2aa893c Mon Sep 17 00:00:00 2001
From: Lukasz Dorau <lukasz.dorau@intel.com>
Date: Fri, 11 May 2018 15:17:06 +0200
Subject: [PATCH] common: fix Coverity builds

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.
---
 ...-fix-travisci_build_coverity_scan.sh.patch | 27 +++++++++++++++++++
 utils/docker/run-coverity.sh                  | 18 ++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 utils/docker/0001-travis-fix-travisci_build_coverity_scan.sh.patch

diff --git a/utils/docker/0001-travis-fix-travisci_build_coverity_scan.sh.patch b/utils/docker/0001-travis-fix-travisci_build_coverity_scan.sh.patch
new file mode 100644
index 000000000..9738942aa
--- /dev/null
+++ b/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
+
diff --git a/utils/docker/run-coverity.sh b/utils/docker/run-coverity.sh
index d74868d6f..7c7915f37 100755
--- a/utils/docker/run-coverity.sh
+++ b/utils/docker/run-coverity.sh
@@ -47,7 +47,23 @@ export COVERITY_SCAN_PROJECT_NAME="pmem/vltrace"
 export COVERITY_SCAN_BUILD_COMMAND="make"
 
 # Run the Coverity scan
-curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | bash
+
+# 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.
+# 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
 
 # print out the Coverity log if it exists
 COVERITY_LOG=/vltrace/build/cov-int/scm_log.txt