Merge pull request +12023 from c9/b9

some more b9 fixes

b9/b9

@@ -1,6 +1,9 @@
 #!/bin/bash
 
 set -e
+set -o pipefail
+
+export CLOUDSDK_PYTHON_SITEPACKAGES=1
 
 SCRIPT_NAME=$BASH_SOURCE
 if [ -h $SCRIPT_NAME ]; then SCRIPT_NAME=$(readlink $SCRIPT_NAME); fi

b9/lib/deploy.sh

@@ -78,7 +78,7 @@ b9_deploy() {
     rm $TMPFILE
 
     SERVER_LIST="$(_b9_deploy_server_list $SERVER_PATTERN $USE_REGEX)"
-    local CMD="$B9 exec _b9_deploy_one_from_${ASSET} $VERSION $SERVICES $SETTINGS $NO_CHECK"
+    local CMD="$B9 exec _b9_deploy_one_from_${ASSET} $NO_CHECK $VERSION $SERVICES $SETTINGS"
     if [ "$DRY_RUN" == "1" ]; then
         CMD="echo $CMD"
     fi
@@ -95,10 +95,10 @@ _b9_deploy_strategy_slow_start() {
     $CMD $(echo "$SERVER_LIST" | head -n1)
     
     # then two
-    echo "$SERVER_LIST" | tail -n +2  | head -n2 | parallel --halt 2 $CMD
+    echo "$SERVER_LIST" | tail -n +2  | head -n2 | parallel --halt 1 $CMD
     
     # then the rest
-    echo "$SERVER_LIST" | tail -n +4 | parallel --halt 2 -j 15 $CMD
+    echo "$SERVER_LIST" | tail -n +4 | parallel --halt 1 -j 15 $CMD
 }
 
 _b9_deploy_strategy_parallel() {
@@ -109,7 +109,7 @@ _b9_deploy_strategy_parallel() {
     $CMD $(echo "$SERVER_LIST" | head -n1)
     
     # then the rest
-    echo "$SERVER_LIST" | tail -n +2 | parallel --halt 2 -j 30 $CMD
+    echo "$SERVER_LIST" | tail -n +2 | parallel --halt 1 -j 30 $CMD
 }
 
 _b9_deploy_strategy_serial() {
@@ -126,6 +126,13 @@ _b9_deploy_server_list () {
 }
 
 _b9_deploy_one_from_gcs() {
+    local NO_CHECK=$1
+    if [ "$NO_CHECK" == "--no-check" ]; then
+        shift
+    else
+        NO_CHECK=""
+    fi
+    
     local VERSION=$1
     local SERVICES=$2
     local SETTINGS=$3
@@ -185,7 +192,7 @@ _b9_deploy_check() {
     local SERVICES=$2
     local SETTINGS=$3
     
-    echo $SERVICES | sed 's/,/\n/g' | parallel --halt 2 -j 0 $B9 exec _b9_deploy_check_one $SERVER $SETTINGS
+    echo $SERVICES | sed 's/,/\n/g' | parallel --halt 1 -j 0 $B9 exec _b9_deploy_check_one $SERVER $SETTINGS
 }
 
 _b9_deploy_check_one() {

b9/lib/package.sh

@@ -60,7 +60,7 @@ b9_package() {
    
     _b9_package_init_git_cache
    
-    VERSION=c9-${TYPE}-${SETTINGS}-$(_b9_get_version $TREEISH)
+    VERSION=$(_b9_get_version $TREEISH $TYPE $SETTINGS)
    
     if [ "$USE_CACHE" == "1" ] && _b9_package_is_cached $STORAGE $VERSION; then
         echo $VERSION
@@ -98,9 +98,11 @@ _d9_package_init_work_dir() {
 
 _b9_get_version() {
     local TREEISH=$1
+    local TYPE=${2:-newclient}
+    local SETTINGS=${3:-all}
     
     pushd $B9_PACKAGE_GIT_CACHE &> /dev/null
-    echo $(git show $TREEISH:package.json | jq -r .version)-$(git rev-parse --short=8 $TREEISH)
+    echo c9-${TYPE}-${SETTINGS}-$(git show $TREEISH:package.json | jq -r .version)-$(git rev-parse --short=8 $TREEISH)
     popd &> /dev/null
 }