From 368203063607ffb5c32b26ba23a525dde04b7be5 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Fri, 5 Dec 2014 14:41:07 -0500 Subject: [PATCH 1/4] Re #10636. Hopefully fixing coverity builds. --- Code/Mantid/Build/Jenkins/buildscript | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript index 9e5d6139d1a4..8cc5ef13f8f3 100755 --- a/Code/Mantid/Build/Jenkins/buildscript +++ b/Code/Mantid/Build/Jenkins/buildscript @@ -95,6 +95,18 @@ fi ############################################################################### $SCL_ON_RHEL6 "cmake -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=${PARAVIEW_DIR} -DDOCS_HTML=ON ${PACKAGINGVARS} ../Code/Mantid" +############################################################################### +# Coverity build should exit early +############################################################################### +if [[ ${JOB_NAME} == *coverity_build_and_submit* ]]; then + ${COVERITY_DIR}/cov-build --dir cov-int scl enable mantidlibs "make -j${BUILD_THREADS}" + tar czvf mantid.tgz cov-int + status=$(curl --form token=$COVERITY_TOKEN --form email=mantidproject@gmail.com \ + --form file=@mantid.tgz --form version=$GIT_COMMIT \ + https://scan.coverity.com/builds?project=mantidproject%2Fmantid) + return $status +fi + ############################################################################### # Build step ############################################################################### From 25d7cc7c8c2ea65caf162332613aac1deedf4432 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Fri, 5 Dec 2014 16:44:23 -0500 Subject: [PATCH 2/4] Re #10636. Trying to fix the script. --- Code/Mantid/Build/Jenkins/buildscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript index 8cc5ef13f8f3..8c2b7b4db94e 100755 --- a/Code/Mantid/Build/Jenkins/buildscript +++ b/Code/Mantid/Build/Jenkins/buildscript @@ -104,7 +104,11 @@ if [[ ${JOB_NAME} == *coverity_build_and_submit* ]]; then status=$(curl --form token=$COVERITY_TOKEN --form email=mantidproject@gmail.com \ --form file=@mantid.tgz --form version=$GIT_COMMIT \ https://scan.coverity.com/builds?project=mantidproject%2Fmantid) - return $status + if [[ ${status} ]]; then + return ${status} + else + return 0 + fi fi ############################################################################### From 38845ed641a822f032125ac4aa5276e3a3ddfa8b Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Fri, 5 Dec 2014 16:52:21 -0500 Subject: [PATCH 3/4] Re #10636. "exit" is the correct command. --- Code/Mantid/Build/Jenkins/buildscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript index 8c2b7b4db94e..857b6cfa7351 100755 --- a/Code/Mantid/Build/Jenkins/buildscript +++ b/Code/Mantid/Build/Jenkins/buildscript @@ -105,9 +105,9 @@ if [[ ${JOB_NAME} == *coverity_build_and_submit* ]]; then --form file=@mantid.tgz --form version=$GIT_COMMIT \ https://scan.coverity.com/builds?project=mantidproject%2Fmantid) if [[ ${status} ]]; then - return ${status} + exit 1 else - return 0 + exit 0 fi fi From 8334731f9b83e3652dee321392e2607e35396905 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Mon, 8 Dec 2014 10:37:06 -0500 Subject: [PATCH 4/4] Attempting to do a better return status --- Code/Mantid/Build/Jenkins/buildscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript index 857b6cfa7351..be8c2a4b3260 100755 --- a/Code/Mantid/Build/Jenkins/buildscript +++ b/Code/Mantid/Build/Jenkins/buildscript @@ -104,10 +104,12 @@ if [[ ${JOB_NAME} == *coverity_build_and_submit* ]]; then status=$(curl --form token=$COVERITY_TOKEN --form email=mantidproject@gmail.com \ --form file=@mantid.tgz --form version=$GIT_COMMIT \ https://scan.coverity.com/builds?project=mantidproject%2Fmantid) - if [[ ${status} ]]; then - exit 1 - else + status=$(echo ${status} | sed -e 's/^ *//' -e 's/ *$//') + if [[ -z $status ]]; then exit 0 + else + echo "$status" + exit 1 fi fi