X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5512f001241c17152087ed5b5a28f94a9c629541..53843c61d600a0911e9f4f512b0d5c34b18f9d33:/build/run-build-test-packages-one-target.sh diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh index 744b5834d8..b98a4c0a7e 100755 --- a/build/run-build-test-packages-one-target.sh +++ b/build/run-build-test-packages-one-target.sh @@ -14,6 +14,8 @@ Syntax: --upload If the build and test steps are successful, upload the packages to a remote apt repository (default: false) +--rc + Optional Parameter to build Release Candidate --build-version Version to build (default: \$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or @@ -40,7 +42,7 @@ if ! [[ -d "$WORKSPACE" ]]; then fi PARSEDOPTS=$(getopt --name "$0" --longoptions \ - help,upload,target:,build-version: \ + help,upload,rc,target:,build-version: \ -- "" "$@") if [ $? -ne 0 ]; then exit 1 @@ -48,6 +50,7 @@ fi TARGET=debian8 UPLOAD=0 +RC=0 declare -a build_args=() @@ -65,6 +68,9 @@ while [ $# -gt 0 ]; do --upload) UPLOAD=1 ;; + --rc) + RC=1 + ;; --build-version) build_args+=("$1" "$2") shift @@ -115,7 +121,13 @@ if [[ "$UPLOAD" != 0 ]]; then timer_reset if [ ${#failures[@]} -eq 0 ]; then - /usr/local/arvados-dev/jenkins/run_upload_packages.py -H jenkinsapt@apt.arvados.org -o Port=2222 --workspace $WORKSPACE $TARGET + if [[ "$RC" != 0 ]]; then + echo "/usr/local/arvados-dev/jenkins/run_upload_packages_testing.py -H jenkinsapt@apt.arvados.org -o Port=2222 --workspace $WORKSPACE $TARGET" + /usr/local/arvados-dev/jenkins/run_upload_packages_testing.py -H jenkinsapt@apt.arvados.org -o Port=2222 --workspace $WORKSPACE $TARGET + else + echo "/usr/local/arvados-dev/jenkins/run_upload_packages.py -H jenkinsapt@apt.arvados.org -o Port=2222 --workspace $WORKSPACE $TARGET" + /usr/local/arvados-dev/jenkins/run_upload_packages.py -H jenkinsapt@apt.arvados.org -o Port=2222 --workspace $WORKSPACE $TARGET + fi else echo "Skipping package upload, there were errors building and/or testing the packages" fi @@ -123,4 +135,4 @@ if [[ "$UPLOAD" != 0 ]]; then title "End of upload packages (`timer`)" fi -exit_cleanly +exit_cleanly \ No newline at end of file