)
fi
- COMMAND="/jenkins/test-packages-$TARGET.sh"
+ COMMAND="/jenkins/package-testing/test-packages-$TARGET.sh"
IMAGE="arvados/package-test:$TARGET"
else
IMAGE="arvados/build:$TARGET"
if [[ -n "$test_packages" ]]; then
pushd "$JENKINS_DIR/package-test-dockerfiles"
else
- pushd "$JENKINS_DIR/dockerfiles"
+ pushd "$JENKINS_DIR/package-build-dockerfiles"
fi
echo $TARGET
keep-web
libarvados-perl"
- if test "$target" = centos6 ; then
- packages="$packages python27-python-arvados-fuse
+ case "$TARGET" in
+ centos6)
+ packages="$packages python27-python-arvados-fuse
python27-python-arvados-python-client"
- else
- packages="$packages python-arvados-fuse
+ ;;
+ *)
+ packages="$packages python-arvados-fuse
python-arvados-python-client"
- fi
+ ;;
+ esac
fi
FINAL_EXITCODE=0
package_fails=""
+set +e
if [[ -n "$test_packages" ]]; then
for p in $packages ; do
- if ! docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
- --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND $p ; then
- FINAL_EXITCODE=$?
+ 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
package_fails="$package_fails $p"
- echo "ERROR: $tag build failed with exit status $FINAL_EXITCODE." >&2
+ echo "ERROR: $tag test failed with exit status $FINAL_EXITCODE." >&2
fi
done
else
- if docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
- --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND; then
- # Success - nothing more to do.
- true
+ docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
+ --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND
+ CODE=$?
+ if test $CODE = 0 ; then
+ echo
+ echo "Build packages for $TARGET succeeded." >&2
else
- FINAL_EXITCODE=$?
+ FINAL_EXITCODE=$CODE
echo "ERROR: $tag build failed with exit status $FINAL_EXITCODE." >&2
fi
fi
if test -n "$package_fails" ; then
- echo "Failed package tests:$package_fails"
+ echo "Failed package tests:$package_fails" >&2
fi
exit $FINAL_EXITCODE