12721: --version => --build-version. Make iteration mandatory.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/build/run-build-packages-all-targets.sh b/build/run-build-packages-all-targets.sh
index 1ee8e583fe808f72d62c03d656d779229f662872..bb2b2af7b2acf1df55f3f5f60f3c7f6649ad23ef 100755 (executable)
--- a/build/run-build-packages-all-targets.sh
+++ b/build/run-build-packages-all-targets.sh
@@ -17,7 +17,7 @@ Options:
     Run package install tests
 --debug
     Output debug information (default: false)
---version <string>
+--build-version <string>
     Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
 
 WORKSPACE=path         Path to the Arvados source tree to build packages from
@@ -43,7 +43,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 +74,7 @@ while [ $# -gt 0 ]; do
         --only-test)
             ONLY_TEST="$1 $2"; shift
             ;;
-        --version)
+        --build-version)
             ARVADOS_BUILDING_VERSION="$2"; shift
             ;;
         --)
@@ -92,7 +92,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=$?

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index cf60b5e2d9b3a365be3cca25ce33dd260d038725..aa8d15bbc8813547e77036fa77de649403a0ca6d 100755 (executable)
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -21,7 +21,7 @@ Syntax:
     Build only a specific package
 --only-test <package>
     Test only a specific package
---version <string>
+--build-version <string>
     Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
 
 WORKSPACE=path         Path to the Arvados source tree to build packages from
@@ -47,7 +47,7 @@ if ! [[ -d "$WORKSPACE" ]]; then
 fi
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
-    help,debug,test-packages,target:,command:,only-test:,only-build:,version: \
+    help,debug,test-packages,target:,command:,only-test:,only-build:,build-version: \
     -- "" "$@")
 if [ $? -ne 0 ]; then
     exit 1
@@ -85,7 +85,7 @@ while [ $# -gt 0 ]; do
         --test-packages)
             test_packages=1
             ;;
-        --version)
+        --build-version)
             ARVADOS_BUILDING_VERSION="$2"
             shift
             ;;
@@ -101,9 +101,16 @@ done
 
 set -e
 
-IFS=- read ARVADOS_BUILDING_VERSION ARVADOS_BUILDING_ITERATION <<EOF
+if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
+    IFS=- read ARVADOS_BUILDING_VERSION ARVADOS_BUILDING_ITERATION <<EOF
 $ARVADOS_BUILDING_VERSION
 EOF
+    if [[ -z "$ARVADOS_BUILDING_ITERATION" ]]; then
+        echo >&2 "FATAL: version does not include an iteration. Try --build-version ${ARVADOS_BUILDING_VERSION}-1"
+        exit 1
+    fi
+fi
+
 
 if [[ -n "$test_packages" ]]; then
     if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then