[ARVADOS] created: 1.1.1-263-g6cf3825

[Git user]

        at  6cf3825010724a7d2ebceac5666c89090fadcb91 (commit)


commit 6cf3825010724a7d2ebceac5666c89090fadcb91
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Dec 15 12:51:07 2017 -0500

    12721: Add run-build-test-packages-one-target.sh --build-version arg
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-build-packages-all-targets.sh b/build/run-build-packages-all-targets.sh
index bb2b2af..85c498e 100755
--- a/build/run-build-packages-all-targets.sh
+++ b/build/run-build-packages-all-targets.sh
@@ -18,7 +18,9 @@ Options:
 --debug
     Output debug information (default: false)
 --build-version <string>
-    Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
+    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
 
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index ef7862c..c675a24 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -22,7 +22,9 @@ Syntax:
 --only-test <package>
     Test only a specific package
 --build-version <string>
-    Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
+    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
 
diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index 24942e9..744b583 100755
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -14,6 +14,10 @@ Syntax:
 --upload
     If the build and test steps are successful, upload the packages
     to a remote apt repository (default: false)
+--build-version <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
 
@@ -36,7 +40,7 @@ if ! [[ -d "$WORKSPACE" ]]; then
 fi
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
-    help,upload,target: \
+    help,upload,target:,build-version: \
     -- "" "$@")
 if [ $? -ne 0 ]; then
     exit 1
@@ -45,6 +49,8 @@ fi
 TARGET=debian8
 UPLOAD=0
 
+declare -a build_args=()
+
 eval set -- "$PARSEDOPTS"
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -59,6 +65,10 @@ while [ $# -gt 0 ]; do
         --upload)
             UPLOAD=1
             ;;
+        --build-version)
+            build_args+=("$1" "$2")
+            shift
+            ;;
         --)
             if [ $# -gt 1 ]; then
                 echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help"
@@ -69,6 +79,8 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+build_args+=(--target "$TARGET")
+
 exit_cleanly() {
     trap - INT
     report_outcomes
@@ -81,7 +93,7 @@ COLUMNS=80
 title "Start build packages"
 timer_reset
 
-$WORKSPACE/build/run-build-packages-one-target.sh --target $TARGET
+$WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}"
 
 checkexit $? "build packages"
 title "End of build packages (`timer`)"
@@ -90,7 +102,7 @@ title "Start test packages"
 timer_reset
 
 if [ ${#failures[@]} -eq 0 ]; then
-  $WORKSPACE/build/run-build-packages-one-target.sh --target $TARGET --test-packages
+  $WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}" --test-packages
 else
   echo "Skipping package upload, there were errors building the packages"
 fi

-----------------------------------------------------------------------


hooks/post-receive
--