[ARVADOS-DEV] updated: e7d6c195a14c71747b578edd2eeaba9102bcaf53

[Git user]

Summary of changes:
 jenkins/run-deploy.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

       via  e7d6c195a14c71747b578edd2eeaba9102bcaf53 (commit)
      from  688d8cd7d751459ddb7190aa612879847353f47e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e7d6c195a14c71747b578edd2eeaba9102bcaf53
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Nov 29 13:11:04 2016 -0500

    run-deploy.sh: make the concurrency of running puppet a configurable parameter.
    
    No issue #

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 8dcf56b..c1ca11d 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -2,6 +2,7 @@
 
 DEBUG=0
 SSH_PORT=22
+PUPPET_CONCURRENCY=5
 
 read -d] -r SCOPES <<EOF
 --scopes
@@ -34,6 +35,7 @@ function usage {
     echo >&2
     echo >&2 "$0 options:"
     echo >&2 "  -p, --port <ssh port>         SSH port to use (default 22)"
+    echo >&2 "  -c, --concurrency <max>       Maximum concurrency for puppet runs (default 5)"
     echo >&2 "  -d, --debug                   Enable debug output"
     echo >&2 "  -h, --help                    Display this help and exit"
     echo >&2
@@ -45,8 +47,8 @@ function usage {
 
 
 # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
-TEMP=`getopt -o hdp: \
-    --long help,debug,port: \
+TEMP=`getopt -o hdpc: \
+    --long help,debug,port,concurrency: \
     -n "$0" -- "$@"`
 
 if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@ -59,6 +61,9 @@ do
         -p | --port)
             SSH_PORT="$2"; shift 2
             ;;
+        -c | --concurrency)
+            PUPPET_CONCURRENCY="$2"; shift 2
+            ;;
         -d | --debug)
             DEBUG=1
             shift
@@ -233,7 +238,7 @@ export -f run_puppet
 export -f title
 export SSH_PORT
 export PUPPET_AGENT
-echo $nodes|xargs -d " " -n 1 -P 10 -I {} bash -c "run_puppet {}"
+echo $nodes|xargs -d " " -n 1 -P $PUPPET_CONCURRENCY -I {} bash -c "run_puppet {}"
 
 title "Locating Arvados Standard Docker images project"
 

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


hooks/post-receive
--