8008: Tweak error code reporting. Remove debugging line.

diff --git a/jenkins/run-build-packages-all-targets.sh b/jenkins/run-build-packages-all-targets.sh
index 64c126240fb2c00d2955d0b4f259a1e8d2584d67..f1a1e1c4b3fa76eb5173109f071ee5b19f39b0b7 100755 (executable)
--- a/jenkins/run-build-packages-all-targets.sh
+++ b/jenkins/run-build-packages-all-targets.sh
@@ -84,11 +84,10 @@ cd $(dirname $0)
 FINAL_EXITCODE=0
 
 for dockerfile_path in $(find -name Dockerfile); do
-    ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" $DEBUG $TEST_PACKAGES $ONLY_TEST
-
-    CODE=$?
-    if test $CODE != 0 ; then
-        FINAL_EXITCODE=$CODE
+    if ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" $DEBUG $TEST_PACKAGES $ONLY_TEST ; then
+        true
+    else
+        FINAL_EXITCODE=$?
     fi
 done
 

diff --git a/jenkins/run-build-packages-one-target.sh b/jenkins/run-build-packages-one-target.sh
index ebfc0bed1397e469c8bcad8e08d9d193cef7d318..e8008973c4ee365e7ebc26332da76b77466477b3 100755 (executable)
--- a/jenkins/run-build-packages-one-target.sh
+++ b/jenkins/run-build-packages-one-target.sh
@@ -149,30 +149,27 @@ FINAL_EXITCODE=0
 
 package_fails=""
 
-set +e
 if [[ -n "$test_packages" ]]; then
     for p in $packages ; do
-        docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
+        if docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
                --env ARVADOS_DEBUG=1 \
                --env "TARGET=$TARGET" \
                --env "WORKSPACE=/arvados" \
-               "$IMAGE" $COMMAND $p
-        CODE=$?
-        if test $CODE != 0 ; then
-            FINAL_EXITCODE=$CODE
+               "$IMAGE" $COMMAND $p ; then
+            true
+        else
+            FINAL_EXITCODE=$?
             package_fails="$package_fails $p"
             echo "ERROR: $tag test failed with exit status $FINAL_EXITCODE." >&2
         fi
     done
 else
-    docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
-           --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND
-    CODE=$?
-    if test $CODE = 0 ; then
+    if docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
+           --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND ; then
         echo
         echo "Build packages for $TARGET succeeded." >&2
     else
-        FINAL_EXITCODE=$CODE
+        FINAL_EXITCODE=$?
         echo "ERROR: $tag build failed with exit status $FINAL_EXITCODE." >&2
     fi
 fi

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 30ba4cdbbcaf66a5e38b075dcf75b69852a866a4..445b3a0edb741e1f9df35e63f84626a438cd8263 100755 (executable)
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -285,7 +285,6 @@ handle_python_package
     fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
 
     rm -rf "$SRC_BUILD_DIR"
-    echo $?
 )
 
 # Go binaries