X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd4a811b896da640e5b8ddca7e515f19085932d4..98d63ca62daada9803edfdd5ad72304cae19b92c:/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 f8816dbe48..7a91cb4de1 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -106,7 +106,11 @@ while [ $# -gt 0 ]; do elif ! [[ "$2" =~ (.*)-(.*) ]]; then echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?" exit 1 + elif ! [[ "$2" =~ ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$ ]]; then + echo >&2 "FATAL: --build-version '$2' is invalid, must match pattern ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$" + exit 1 else + [[ "$2" =~ (.*)-(.*) ]] ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}" ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}" fi @@ -192,27 +196,39 @@ popd if test -z "$packages" ; then packages="arvados-api-server arvados-client + arvados-controller + arvados-dispatch-cloud + arvados-dispatch-lsf arvados-docker-cleaner arvados-git-httpd - arvados-node-manager + arvados-health + arvados-server arvados-src + arvados-sync-groups arvados-workbench + arvados-workbench2 + arvados-ws crunch-dispatch-local crunch-dispatch-slurm crunch-run crunchstat + keepproxy + keepstore keep-balance keep-block-check - keepproxy keep-rsync - keepstore + keep-exercise + keep-rsync + keep-block-check keep-web libarvados-perl - libpam-arvados libpam-arvados-go - python-arvados-fuse - python-arvados-python-client - python-arvados-cwl-runner" + python3-cwltest + python3-arvados-fuse + python3-arvados-python-client + python3-arvados-cwl-runner + python3-crunchstat-summary + python3-arvados-user-activity" fi FINAL_EXITCODE=0