[ARVADOS-DEV] updated: a8c09e00f06c51887497b94b98178b2815e149e2
git at public.curoverse.com
git at public.curoverse.com
Thu Jan 21 14:47:28 EST 2016
Summary of changes:
jenkins/run-build-packages-all-targets.sh | 9 ++++-----
jenkins/run-build-packages-one-target.sh | 19 ++++++++-----------
jenkins/run-build-packages.sh | 1 -
3 files changed, 12 insertions(+), 17 deletions(-)
via a8c09e00f06c51887497b94b98178b2815e149e2 (commit)
from 7512b31d3c7e3ae890a37b2222f113c9b351d86a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a8c09e00f06c51887497b94b98178b2815e149e2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jan 21 14:30:03 2016 -0500
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 64c1262..f1a1e1c 100755
--- 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 ebfc0be..e800897 100755
--- 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 30ba4cd..445b3a0 100755
--- 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list