X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c5e28c9012ff802ee35c43cbf3e2b5127850f96c..dcdaf7450fb66da2bc904a21f29660ac75e5864a:/build/run-build-packages-one-target.sh diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index 5e761fbd24..b1801dd307 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -198,7 +198,7 @@ if [[ -n "$test_packages" ]]; then else IMAGE="arvados/build:$TARGET" if [[ "$COMMAND" != "" ]]; then - COMMAND="/usr/local/rvm/bin/rvm-exec default bash /jenkins/$COMMAND --target $TARGET$DEBUG" + COMMAND="bash /jenkins/$COMMAND --target $TARGET$DEBUG" fi fi @@ -206,11 +206,10 @@ JENKINS_DIR=$(dirname "$(readlink -e "$0")") if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then if [[ -n "$test_packages" ]]; then - pushd "$JENKINS_DIR/package-test-dockerfiles" - make "$TARGET/generated" + pushd "$JENKINS_DIR/package-test-dockerfiles" else - pushd "$JENKINS_DIR/package-build-dockerfiles" - make "$TARGET/generated" + pushd "$JENKINS_DIR/package-build-dockerfiles" + make "$TARGET/generated" fi GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}') @@ -231,7 +230,6 @@ if test -z "$packages" ; then arvados-dispatch-cloud arvados-dispatch-lsf arvados-docker-cleaner - arvados-git-httpd arvados-health arvados-server arvados-src