Make debian9 the default target for our package building scripts.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 9b21b58e2af75d8968c68f7280adb707c8c444ba..69defb003be91b7bbfc0dfd45533eb1ae654e231 100755 (executable)
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -10,7 +10,7 @@ Syntax:
         WORKSPACE=/path/to/arvados $(basename $0) [options]
 
 --target <target>
-    Distribution to build packages for (default: debian8)
+    Distribution to build packages for (default: debian9)
 --command
     Build command to execute (default: use built-in Docker image command)
 --test-packages
@@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-TARGET=debian8
+TARGET=debian9
 COMMAND=
 DEBUG=
 
@@ -262,6 +262,7 @@ else
     set +e
     mv -f ${WORKSPACE}/packages/${TARGET}/* ${WORKSPACE}/packages/${TARGET}/processed/ 2>/dev/null
     set -e
+set -x
     # Build packages. ulimit option can be removed when debian8 and ubuntu1404 are retired
     if docker run --ulimit nofile=4096:4096 \
         --rm \

diff --git a/build/run-build-packages-sso.sh b/build/run-build-packages-sso.sh
index d6a21178f8cfe3d224a08f955ca35eeb996d0dff..e7a3aacda3ca5aaea64dac8c1fd52d7b9f766b24 100755 (executable)
--- a/build/run-build-packages-sso.sh
+++ b/build/run-build-packages-sso.sh
@@ -17,7 +17,7 @@ Options:
 --debug
     Output debug information (default: false)
 --target
-    Distribution to build packages for (default: debian8)
+    Distribution to build packages for (default: debian9)
 
 WORKSPACE=path         Path to the Arvados SSO source tree to build packages from
 
@@ -25,7 +25,7 @@ EOF
 
 EXITCODE=0
 DEBUG=${ARVADOS_DEBUG:-0}
-TARGET=debian8
+TARGET=debian9
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
     help,build-bundle-packages,debug,target: \

diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index b98a4c0a7e0dec9d3c8110712881d05b92f5ec03..962940b799bd1907cc0540dd60a0f96643ebeb18 100755 (executable)
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -10,7 +10,7 @@ Syntax:
         WORKSPACE=/path/to/arvados $(basename $0) [options]
 
 --target <target>
-    Distribution to build packages for (default: debian8)
+    Distribution to build packages for (default: debian9)
 --upload
     If the build and test steps are successful, upload the packages
     to a remote apt repository (default: false)
@@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-TARGET=debian8
+TARGET=debian9
 UPLOAD=0
 RC=0
 
@@ -135,4 +135,4 @@ if [[ "$UPLOAD" != 0 ]]; then
   title "End of upload packages (`timer`)"
 fi
 
-exit_cleanly
\ No newline at end of file
+exit_cleanly