X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3d83f0021e4a063924bcfdd08af77b6829a8032..2ed8d670a5d6f93eed57cb14138323cc835e027f:/build/run-build-packages-all-targets.sh diff --git a/build/run-build-packages-all-targets.sh b/build/run-build-packages-all-targets.sh index 1ee8e583fe..85c498ecd5 100755 --- a/build/run-build-packages-all-targets.sh +++ b/build/run-build-packages-all-targets.sh @@ -17,8 +17,10 @@ Options: Run package install tests --debug Output debug information (default: false) ---version - Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash) +--build-version + Version to build (default: + \$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or + 0.1.timestamp.commithash) WORKSPACE=path Path to the Arvados source tree to build packages from @@ -43,7 +45,7 @@ fi set -e PARSEDOPTS=$(getopt --name "$0" --longoptions \ - help,test-packages,debug,command:,only-test:,version: \ + help,test-packages,debug,command:,only-test:,build-version: \ -- "" "$@") if [ $? -ne 0 ]; then exit 1 @@ -74,7 +76,7 @@ while [ $# -gt 0 ]; do --only-test) ONLY_TEST="$1 $2"; shift ;; - --version) + --build-version) ARVADOS_BUILDING_VERSION="$2"; shift ;; --) @@ -92,7 +94,7 @@ cd $(dirname $0) FINAL_EXITCODE=0 for dockerfile_path in $(find -name Dockerfile | grep package-build-dockerfiles); do - if ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" --version "$ARVADOS_BUILDING_VERSION" $DEBUG $TEST_PACKAGES $ONLY_TEST ; then + if ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" --build-version "$ARVADOS_BUILDING_VERSION" $DEBUG $TEST_PACKAGES $ONLY_TEST ; then true else FINAL_EXITCODE=$?