Merge branch 'master' into 14874-protected-collection-properties

[arvados.git] / build / run-build-packages-sso.sh

diff --git a/build/run-build-packages-sso.sh b/build/run-build-packages-sso.sh
index cc673a6d3353c56a22c416b4139dbb957045da05..e7a3aacda3ca5aaea64dac8c1fd52d7b9f766b24 100755 (executable)
--- a/build/run-build-packages-sso.sh
+++ b/build/run-build-packages-sso.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 JENKINS_DIR=$(dirname $(readlink -e "$0"))
 . "$JENKINS_DIR/run-library.sh"
@@ -14,7 +17,7 @@ Options:
 --debug
     Output debug information (default: false)
 --target
-    Distribution to build packages for (default: debian7)
+    Distribution to build packages for (default: debian9)
 
 WORKSPACE=path         Path to the Arvados SSO source tree to build packages from
 
@@ -22,7 +25,7 @@ EOF
 
 EXITCODE=0
 DEBUG=${ARVADOS_DEBUG:-0}
-TARGET=debian7
+TARGET=debian9
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
     help,build-bundle-packages,debug,target: \
@@ -68,19 +71,13 @@ if [[ "$DEBUG" != 0 ]]; then
 fi
 
 case "$TARGET" in
-    debian7)
+    debian*)
         FORMAT=deb
         ;;
-    debian8)
+    ubuntu*)
         FORMAT=deb
         ;;
-    ubuntu1204)
-        FORMAT=deb
-        ;;
-    ubuntu1404)
-        FORMAT=deb
-        ;;
-    centos6)
+    centos*)
         FORMAT=rpm
         ;;
     *)