Merge lp:~ricardokirkner/ols-jenkaas/partial-setup into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Ricardo Kirkner]

allow setting up master/builder/slave separately

[Daniel Manrique (roadmr)]

LGTM and no change in default behavior AFAICT.

review: Approve

Unmerged revisions

448. By Ricardo Kirkner on 2017-08-09

allow setting up master/builder/slave separately

447. By Ricardo Kirkner on 2017-08-09

run docker jobs directly on slave

=== modified file 'testing/setup-jenkaas'
--- testing/setup-jenkaas	2017-02-28 10:50:28 +0000
+++ testing/setup-jenkaas	2017-08-09 20:35:37 +0000
@@ -7,6 +7,8 @@
 # get there, a few constraints are introduced to make sure the whole setup
 # is fully automated.
 
+TARGET=${1:-all}
+
 vm_conf () ols-vms config $1 $2
 vm_status () ols-vms status $1
 vm_stop () if [ `vm_status $1` = "RUNNING" ] ; then ols-vms stop $1 ; fi
@@ -46,6 +48,8 @@
 ols-vms config ${MASTER} testing.landing.user=$(bzr lp-login)
 ols-vms config ${MASTER} testing.build.user=$(bzr lp-login)
 
+if [ "${TARGET}" = "all" -o "${TARGET}" = "master" ]; then
+
 echo "===================== Setup master ========================"
 
 ols-vms setup ${MASTER}
@@ -66,6 +70,10 @@
 ols-vms config ${SLAVE} testing.master=${MASTER_URL}
 ols-vms config ${JOB_BUILDER} testing.master=${MASTER_URL}
 
+fi
+
+if [ "${TARGET}" = "all" -o "${TARGET}" = "builder" ]; then
+
 echo "===================== Setup job builder ========================"
 
 # Match production users/teams to the local dev needs (same as jenkins
@@ -95,6 +103,10 @@
 # Install the existing jobs
 ols-vms shell ${JOB_BUILDER} '. ~/.profile && jenkins-jobs update jenkaas/jobs/'
 
+fi
+
+if [ "${TARGET}" = "all" -o "${TARGET}" = "slave" ]; then
+
 echo "===================== Setup slave(s) ========================"
 
 ols-vms setup ${SLAVE}
@@ -110,6 +122,7 @@
 ols-vms shell ${SLAVE} @testing/setup/seed-slave
 testing/setup/seeded-slave ${SLAVE} ${JOB_BUILDER}
 
+fi
 
 # Give back a clickable link and let the fun begins.
 echo "Jenkins master is at ${MASTER_URL}"