Merge lp:~1chb1n/ubuntu-openstack-ci/ss8-redeploy into lp:ubuntu-openstack-ci

[Ryan Beisner]

[1chb1n, r=admcleod] Refactor for redeploy on serverstack8 with Juju2 below and on top

Rearrange directories to separate run-time from deploy-time

Switch to scripted deploy due to fat pack deb needs of the jenkins charms

Update deploy scripts

Refactor helpers

Update tox config

Refactor openstack client usage for ksv3

Update post-deploy scripts

Add func_exec tox coverage

Update charm-test-infra usage

Activate clients for gerrit review builder part

Update bucket junk cleanup

Remove references to juju1 bighammer destroyer

Move rsync backup snipped from job to script

Clean up lint runner script

Add layerci_build_if_necessary

Add destroy builder

Add bootstrap builder

Update post-destroy info dump and juju status

Update juju-wait calls

Add cs_deploy_charm builder

Update amulet runners

Update amulet full runner

Use updated log puller

Update charm single runner for config file name

Beware - this was a major refactor and deprecation of a ton of legacy things.

OSCI has been running live on this since April, and gate jobs are A-OK.

[lp:~1chb1n/ubuntu-openstack-ci/ss8-redeploy]

468. By Ryan Beisner on 2017-05-23

Clean up _junk

469. By Ryan Beisner on 2017-05-23

Prefer py35 unit tests over p27

470. By Ryan Beisner on 2017-05-23

Revert to preferring py27 as py35 is not supported across all repos yet

471. By Ryan Beisner on 2017-05-23

Prefer py35 for layers and interfaces; py27 for classic charms

472. By Ryan Beisner on 2017-05-23

Switch oscirc back to official repo in prep for branch landing

[Andrew McLeod (admcleod)]

Lvvl&GTM +1

review: Approve

[lp:~1chb1n/ubuntu-openstack-ci/ss8-redeploy]

473. By Ryan Beisner on 2017-05-27

Use merged bot-control master branch

=== modified file '.bzrignore'
--- .bzrignore	2017-02-17 17:08:22 +0000
+++ .bzrignore	2017-05-27 00:22:36 +0000
@@ -1,20 +1,13 @@
-deployment/precise
-deployment/trusty
-deployment/utopic
-precise
-trusty
-utopic
-deployment/out
-deployment/deploy-files/id_dsa
-deployment/deploy-files/id_dsa.pub
-deployment/deploy-files/id_rsa
-deployment/deploy-files/id_rsa.pub
-deployment/deploy-files/uosci-bot-go-cookies.tar.bz2
-populate/credentials
+*.tmp
+id_*
+*cookies*
+credentials
 hooks
 bin
-deployment/jobs/jobs-static-initial.tgz
+jobs-static-initial.tgz
 temp.py
 .coverage
-deployment/deploy-files/novarc-artifactcloud
-*/.tox
+novarc*
+*.tox
+secrets
+deploy/jobs-static/charm_pusher*

=== removed file 'README.deploy'
--- README.deploy	2015-09-23 15:02:04 +0000
+++ README.deploy	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-Ubuntu OpenStack CI - Jenkins Environment
-
-====={ DEPLOYMENT README }=====
-
-Purpose & requirements:
-  * 'Deployment' in this doc and in the ./deployment directory is in relation
-    to deployment of the jenkins environment, not the environments which may
-    be deployed by tests controlled by that jenkins environment.
-
-  * Creates a new jenkins master+slave(s) juju deployment in an openstack
-    tenant, upgrades jenkins war to latest release (via war, not deb).
-
-  * This will deploy the deployer bundle defined in config.yaml to your
-    default local juju environment.
-
-  * This will add new neutron networks and subnets, 1 per master and 1 per
-    slave, and connect them to the router specified in config.yaml, unless
-    networks splits are set to False in that config yaml.
-
-  * Must have OpenStack credentials sourced.  ie.   source ~/novarc
- 
-  * Must have a local Juju environment configured for use with the host
-    openstack environment.
-
-  * Intended to be run from a bastion or other system admin instance within
-    the tenant.  This local unit will not participate in the jenkins enviro
-    other than for admin purposes.
-
-Prep:
-  * Review and adjust deploy-config.yaml and the 
-    deploy-files/environments.yaml template file.
-
-  * Review and adjust deploy-files xml files.  ie. build publish password
-    is not set, but target is.  Some jenkins config is/can be pre-populated
-    there, such as plugin proxy.
-
-  * Ensure that neutron network quotas and ip space make sense for your
-    values, and be aware that this is only aware of /16 and /24 net blocks
-    for the jenkins master & slave isolated networks.
-
-  * For Jenkins on Trusty, it is advisable to download the jenkins.deb
-    and deploy from a local branch of the charm specified in the deployer
-    bundle yaml, as the jenkins repo seems to have some bad days.
-
-  * For the launchpad librarian python routines to authenticate, you should
-    create the OAUTH 'credentials' file using the
-    ./populate/create_credentials.py and place it in
-    /var/lib/jenkins/.config/tarmac/credentials on the jenkins master.  The
-    merge proposal scanner and tarmac require it.  There is an admin script
-    to push it to all units.
-
-Jenkins Infrastructure Deployment:
-      ./deploy.py
-      cd deployment
-      ./post-deploy.sh
-    
-    Or use deployer without post-configuration:
-      cd deployment
-      juju-deployer -B -c 110-uosci-trusty.yaml
-    
-
-Directories:
-  ./               root of this branch
-    env-common     configurable environment variables for admin and deployment
-
-  deployment/      infrastructure (jenkins) deployment & static system jobs
-    bin/           deployment scripts
-    deploy-files/  supporting content for deployment
-    jobs/          initial static jenkins job(s)
-    bundle-dev/    unused WIP / experimental files
-    out/           output may be created by deploy or post-deploy routines
-
-  admin/           misc administrative and debug scripts
-  common/          shared code for admin, deployment, ongoing use
-  dev/             work-in-progress or temporary work-arounds, patches, etc.
-  populate/        see README.jobs
-  tools/           command line tools used in automation/manual testing
-
-
-Notes:
-
-  * See other READMEs for job creation, etc.
-
-  * Jenkins admin login is ubuntu/ubuntu.
-
-  * deploy.py is intended to be safe to run on top of a deployed environment,
-    such as for updating juju environment yamls, IP scheme, etc.  YMMV
-
-  * While this is not a charm, it may be someday, this may use charm helpers.
-
-  * Scripts use juju ssh instead of juju run for two reasons: 
-      - exit codes (it is desired stop on failure)
-      - juju run --all isn't useful here as most of the methods don't apply to
-        non-jenkins service units.
-
-  * NOTE(beisner):  The charms do not currently support configuration of the
-    proxy.xml file which is necessary for installing plugins behind a proxy.
-    Plugins and proxy configuration are handled in post-deploy.  Bug #1356915:
-    "jenkins charm needs proxy support for plugin installation..."  Some
-    manual/static accomodations exist here, specific to serverstack w/ proxy.
-
-  * The deploy-files/plugins file is a list of plugins to install, 1 per line.
-    The post-deploy script (via scripts in bin/) takes care of proxy.xml and
-    plugin installation.
-
-  * The deployed Jenkins version is likely out-dated.  It is recommended to 
-    upgrade jenkins via the war from trunk.  The post-deploy script does that.

=== removed file 'README.hacking'
--- README.hacking	2015-09-25 13:29:23 +0000
+++ README.hacking	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-# Ubuntu OpenStack CI - Hacking Readme
-
-## Local Development
-
-/!\ BEWARE of BUILD SCRIPTS /!\
-*******************************
-Most, if not all, of the build scripts are destructive by default:
-
-  - All juju environments, juju deployments and lxc containers defined on all
-        Jenkins slave units are ephemeral, throw-away bits.
-
-  - If executing a build script locally, bad things WILL happen to existing 
-        environments, containers and/or deployments.
-
-  - All detectable juju environments and lxc containers will be automatically
-        and unequivocally destroyed and torn down without confirmation,
-        including those found in ```~/.juju```, ```~/.cloud-install```,
-        or by ```juju switch -l```.
-
-  - The .ssh/known_hosts file will be cleaned and left with only launchpad entries.
-
-  - The ~/workspace, ~/tools, ~/.juju/environments/, ~/checkout, and ~/.cloud-install
-        directories will also be routinely wiped.
-
-  - The ~/tools (uosci and o-c-t) checkouts will be purged and re-checked
-        out on every run.  If you have customized that locally, and fire
-        off a build script manually in a console, those changes will vanish.
-
-  - This big-hammer approach is the default behavior so that each job will
-        always have a fresh and clean environment.
-
-
-
-### Environment Variables
-When developing and iterating a job or script outside of Jenkins, it may be helpful to
-have your tools checkout dir NOT blown away and refreshed.  Or perhaps you need to
-leave the deployment intact after the script completes, and not automatically tear
-it down.  There are a number of controls that can be exercised via env var exports:
-```
-export NO_TOOLS_REFRESH="True"      # Skip UOSCI and O-C-T branch removal and refresh.
-TODO - Not Implemented:  NO_PRE_DESTROY   # As a safety mechanism for devs.
-export NO_POST_DESTROY="True"     # Skip post-deployment environment destruction.
-```
-
-Notes:
-   - Jenkins passes True (check boxes, etc.) as true, while Python likes True.  Usage varies.
-   - There are many env vars not yet documented here.  See build_osi.sh, and osci_*.sh.
-
-
-## Running Individual Helpers
-The ```job-parts``` directory contains all of the job/script glue in the form of
-helpers in the ```osci_*.sh``` files.  These helper functions can be manually
-called with ```./func_exec.sh``` (presuming you have crafted and exported all
-pertinent environment variables).
-```
-$ ./func_exec.sh 
-A tool to manually trigger functions from CLI.
-    Presumes jenkins environment variables and the
-    overcloud novarc are sourced.
-Usage:  <this script> <function name>
-Available 'f_' functions:
-     f_amulet_no_teardown
-     f_amulet_patch_no_symbols
-     f_amulet_patch_timeout_seconds_announce
-     f_amulet_set_network_env_vars
-     ...snip...
-```
-
-
-## The Dual-Purpose Build Script
-A thoughtfully-constructed Jenkins build script can be functional when called
-manually in a local shell, as well as serve the purpose of the test automation.
-The ```job-parts/build_osi.sh``` makes use of default values when none are
-detected, as an example of how to achieve this.

=== removed file 'README.jobs'
--- README.jobs	2014-10-16 15:39:49 +0000
+++ README.jobs	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-Ubuntu OpenStack CI - Jenkins Environment
-
-
-Purpose & requirements:
-  The (re)populate scripts and methods are intended to be run as the jenkins
-  user from the jenkins master unit console (not from bastion).
-
-Initial Population:
-  At the moment, initial jobs are created from tarball in the post-deployment
-  shell script.
-
-Updating:
-  * The populate/mappings.yaml data file should be updated each development
-    cycle.  The branch scanner jobs utilize that data in triggering jobs.
-    
-  * Jenkins is set to run ./scan_branches.py every 30 minutes, which uses bzr
-    to check the revno and revid of the trigger branches defined in
-    mappings.yaml.  If ANY of the branches change, a deployment of the trigger
-    jobs commences.
-
-  * ./scan_merge_props.py also runs every 30 minutes, which uses LP API
-    to check for merge proposals agains the branches defined in mappings.yaml.
-
-Directories & Files:
-  ./               root of this branch
-    env-common     configurable environment variables for admin and deployment
-    scan_branches.py    see above in 'Updating'
-    populate.py    testing only, generates tarmac conf file
-  populate/        templates, scripts and config data related to jobs
-  deployment/      infrastructure (jenkins) deployment and static system jobs
-  admin/           misc administrative and debug scripts
-
-Notes:
-
-  * See other READMEs for deployment, setup etc.

=== added directory 'deploy'
=== removed file 'deploy-prep.sh'
--- deploy-prep.sh	2016-08-29 11:47:39 +0000
+++ deploy-prep.sh	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-# Pre-deployment prep for bastion instance
-
-sudo apt-get update -y
-sudo apt-get install make python-flake8 python-distro-info python-jinja2 pastebinit distro-info
-
-# Depending on state of upstream jenkins repos, you may have to
-# download and place jenkins.deb in a local charm.  Might add that
-# here as the standard installation method.

=== added file 'deploy/README.md'
--- deploy/README.md	1970-01-01 00:00:00 +0000
+++ deploy/README.md	2017-05-27 00:22:36 +0000
@@ -0,0 +1,11 @@
+### OSCI Deployment
+
+For Juju 2.1.2, on a Xenial-Ocata HA KSV3 undercloud.
+
+* osci-controller-setup.sh
+* osci-model-deploy.sh
+* May have to `juju resolved osci-master/0` to trigger a hook retry.  The jenkins charm as of 2017 Apr 13 has a race condition which consistently requires one re-run of the storage-attached hook.
+* osci-float-all-instances.sh
+* osci-nets-and-models.py
+* osci-set-subnets-dns.sh
+* post-deploy/*  # Look first, use with intent and caution.

=== renamed directory 'deployment/deploy-files' => 'deploy/assets'
=== modified file 'deploy/assets/bashrc'
--- deployment/deploy-files/bashrc	2016-08-29 18:45:24 +0000
+++ deploy/assets/bashrc	2017-05-27 00:22:36 +0000
@@ -116,6 +116,4 @@
   fi
 fi
 
-
 export AMULET_HTTP_PROXY='http://squid.internal:3128'
-alias juju=juju-1  # Default to juju 1.x binary

=== modified file 'deploy/assets/environment-series.yaml'
--- deployment/deploy-files/environment-series.yaml	2016-07-14 19:49:34 +0000
+++ deploy/assets/environment-series.yaml	2017-05-27 00:22:36 +0000
@@ -1,5 +1,5 @@
 ubuntu:
+  - zesty
   - yakkety
   - xenial
   - trusty
-  - precise

=== modified file 'deploy/assets/environments.yaml'
--- deployment/deploy-files/environments.yaml	2016-06-10 13:35:34 +0000
+++ deploy/assets/environments.yaml	2017-05-27 00:22:36 +0000
@@ -1,4 +1,4 @@
-# Ubuntu OpenStack CI - juju environment
+# Ubuntu OpenStack CI - juju 1.x model/environment file
 default: __ENVIRO__
 environments:
   __ENVIRO__:

=== added file 'deploy/assets/osci-repo-boot-clean.sh'
--- deploy/assets/osci-repo-boot-clean.sh	1970-01-01 00:00:00 +0000
+++ deploy/assets/osci-repo-boot-clean.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash -ue
+# Remove existing code checkout if it exists and do a bare minimum code checkout for a job
+. ~/oscirc
+rm -rf $OSCI_ROOT ||:
+mkdir -vp $OSCI_ROOT
+bzr co --lightweight $OSCI_REPO $OSCI_ROOT

=== added file 'deploy/assets/osci-repo-boot.sh'
--- deploy/assets/osci-repo-boot.sh	1970-01-01 00:00:00 +0000
+++ deploy/assets/osci-repo-boot.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash -ue
+# Do a bare minimum code checkout for a job if it doesn't already exist.
+. ~/oscirc
+stat --format="%n %F %y" $OSCI_ROOT/run ||\
+(
+    rm -rf $OSCI_ROOT ||:
+    mkdir -vp $OSCI_ROOT
+    bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+)

=== modified file 'deploy/assets/other_host_keys'
--- deployment/deploy-files/other_host_keys	2016-09-02 21:38:35 +0000
+++ deploy/assets/other_host_keys	2017-05-27 00:22:36 +0000
@@ -2,3 +2,5 @@
 |1|cmsiVx+RyX606psYhBnusb3Z1ZA=|D03P9eiFcN2uEL3ZKWQA/FPjQpo= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGSR3ogUx83TEhmaKks1IZDC287ry3Mc1N8x/hCS6HvUgsZuC3etBWRSqXSKGmzxotpBSU//eehf1YEQ/glkmFg=
 |1|G7bqYoGs0/7WcgVONKheHbvjbW0=|EWaUmfiDVX5psurof0gbxBW6djs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHfg+sp98jxYz9zhxM33ouLNx0rDhXrTLVWU2fZQiMmOCc91H376aU9VzDYd+GRjSewqyz67zpSqsDHd1t6e+J0=
 |1|/uNVERTIWkRm/NIA2HQGM/e+WSs=|584GneqB0FnxjW4yPzufWpoZ3Xw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHfg+sp98jxYz9zhxM33ouLNx0rDhXrTLVWU2fZQiMmOCc91H376aU9VzDYd+GRjSewqyz67zpSqsDHd1t6e+J0=
+|1|pJss/g21mdSvAv7PCtXEl6ikX8s=|lu9UENRQqyzTsGJdMPRJ3YPb4gQ= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDIYipSuaupaQ0PVZiaGWY8oc+r1SLI2PtVyXJA3WcfqrJ79Of7ZOSoHHwwNDkKnzOGj2yu7gohyWBJY2HP83WU=
+

=== modified file 'deploy/assets/pip.conf'
--- deployment/deploy-files/pip.conf	2016-02-09 11:59:39 +0000
+++ deploy/assets/pip.conf	2017-05-27 00:22:36 +0000
@@ -1,2 +1,2 @@
 # [global]
-# index-url = http://10.245.162.102:3141/root/pypi/+simple/
+# index-url = http://t.b.d:3141/root/pypi/+simple/

=== added directory 'deploy/config'
=== added file 'deploy/config/env-common'
--- deploy/config/env-common	1970-01-01 00:00:00 +0000
+++ deploy/config/env-common	2017-05-27 00:22:36 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Mostly in place for the post-deploy script
+
+. ~/novarc
+
+MASTER='osci-master/0'
+JENKINS_HOME=/var/lib/jenkins
+U_HOME=/home/ubuntu
+#OPENSTACK_UBUNTU_ROOT=/var/lib/jenkins/openstack-ubuntu-testing
+#OPENSTACK_UBUNTU_REPO=lp:openstack-ubuntu-testing
+#http_proxy="http://squid.internal:3128"
+#https_proxy="https://squid.internal:3128"
+#HTTP_PROXY=$http_proxy
+#HTTPS_PROXY=$https_proxy
+FILE_TRIGGER_DIR="${JENKINS_HOME}/file-triggers"
+
+# master and all slaves
+UNITS=$(juju status --format=yaml | egrep "osci[-]?(master|slave|lab|task)?/[0-9]{1,10}:" \
+  | cut -d ":" -f 1 | sed 's/^ *//')
+
+LP_ID="uosci-testing-bot"
+BZR_WHOAMI="uoscibot <[e-mail]>"
+
+# deployment/deploy-files
+PRIV_KEY=id_rsa
+PUB_KEY=id_rsa.pub
+SSH_CONF=config

=== added directory 'deploy/config/juju-apps'
=== added file 'deploy/config/juju-apps/osci-lab.yaml'
--- deploy/config/juju-apps/osci-lab.yaml	1970-01-01 00:00:00 +0000
+++ deploy/config/juju-apps/osci-lab.yaml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,4 @@
+osci-lab:
+  slave-executors: 1
+  tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop colordiff nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest lxd python-jinja2 python-launchpadlib python-pika pwgen ipcalc python3-dev tree
+  labels: lab

=== added file 'deploy/config/juju-apps/osci-master.yaml'
--- deploy/config/juju-apps/osci-master.yaml	1970-01-01 00:00:00 +0000
+++ deploy/config/juju-apps/osci-master.yaml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,8 @@
+osci-master:
+  master-executors: 1
+  remove-unlisted-plugins: "no"
+  # place jenkins.deb in charm ./files/ dir before deploy
+  release: bundle  
+  tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop colordiff nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest lxd python-jinja2 python-launchpadlib python-pika pwgen ipcalc python3-dev tree
+  username: ubuntu
+  password: ubuntu

=== added file 'deploy/config/juju-apps/osci-slave.yaml'
--- deploy/config/juju-apps/osci-slave.yaml	1970-01-01 00:00:00 +0000
+++ deploy/config/juju-apps/osci-slave.yaml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,4 @@
+osci-slave:
+  slave-executors: 1
+  tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop colordiff nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest lxd python-jinja2 python-launchpadlib python-pika pwgen ipcalc python3-dev tree
+  labels: slave

=== added file 'deploy/config/juju-apps/osci-task.yaml'
--- deploy/config/juju-apps/osci-task.yaml	1970-01-01 00:00:00 +0000
+++ deploy/config/juju-apps/osci-task.yaml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,4 @@
+osci-task:
+  slave-executors: 16
+  tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop colordiff nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest lxd python-jinja2 python-launchpadlib python-pika pwgen ipcalc python3-dev tree
+  labels: task

=== renamed file 'deployment/deploy-config.yaml' => 'deploy/config/nets-and-models.yaml'
--- deployment/deploy-config.yaml	2016-08-29 12:59:23 +0000
+++ deploy/config/nets-and-models.yaml	2017-05-27 00:22:36 +0000
@@ -1,24 +1,23 @@
 # Config options for deployment and post-deployment actions
 osci:
-  deployer-bundle: "deployment/111-osci1-xenial.yaml"
-
   network:
     # True causes creation of 1 new unique neutron network per jenkins slave,
     # which is cooked into its juju model, and added to a single existing
     # tenant router.  False negates all of the following (leaves flat).
     split: True
 
-    # Base network for jenkins slave juju models, to have its octet
-    # incremented X number of times.  Stick with /24 and /16!
+    # Starting point for generating network CIDRs, to be used for OSCI slave
+    # networks.  Stick with /24 and /16!
     cidr: "172.17.99.0/24"
 
-    # Define which octet to increment for each slave juju enviro: ie. 1.2.3.4
+    # Define which octet to increment for each slave juju model: ie. 1.2.3.4
+    # For /24, use 3;  for /16, use 2.
     var-octet: "3"
 
-    # Name of existing neutron router to wire new networks
+    # Name of existing neutron router for wiring up the new networks
     neutron-router: "osci_router"
 
-    # Name of default network for instance
+    # Name of default network
     default-network: "osci_admin_net"
 
     # Base name of new networks and subnets, to be appended by slave var-octet.
@@ -26,26 +25,16 @@
     neutron-sub: "oscisub"
 
     # DNS servers (comma separated) for the new subnet:
-    neutron-dns: "10.5.0.3"
-
-    # Neutron network name for creating floating IP(s),
-    # And substring to identify existing floating IP (not cidr, just str):
-    ext-net: "ext_net"
-    fip-str: "10.245.162"
-
-  enviro:
-    # New juju model naming control:
-    env-name-base: "osci"
+    neutron-dns: "10.5.0.8"
+
+  model:
+    # Naming control for generated Juju model names:
+    model-name-base: "auto-osci"
     master-abbrv: "ma"
     slave-abbrv: "sv"
     task-abbrv: "tk"
     lab-abbrv: "lb"
 
-    # Template for new juju environments.yaml files:
-    env-template: "deployment/deploy-files/environments.yaml"
-
-    # Local juju model;  will pull apt proxy from first env found:
-    env-reference: "/home/ubuntu/.juju/environments.yaml"
-
+  other:
     # Directory for misc output files:
-    out-dir: "deployment/out"
+    out-dir: "out.tmp"

=== added directory 'deploy/jobs-static'
=== renamed directory 'deployment/jobs/_bak_jenkins_home_no_build_history' => 'deploy/jobs-static/_bak_jenkins_home_no_build_history'
=== modified file 'deploy/jobs-static/_bak_jenkins_home_no_build_history/config.xml'
--- deployment/jobs/_bak_jenkins_home_no_build_history/config.xml	2016-09-21 19:36:25 +0000
+++ deploy/jobs-static/_bak_jenkins_home_no_build_history/config.xml	2017-05-27 00:22:36 +0000
@@ -19,9 +19,7 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -43,29 +41,20 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -eu
-
-if [[ -z $BAK_REMOTE_BASE_DIR ]] || [[ -z $BAK_USER_HOST ]]; then
-  echo &quot; ! Missing one or more of the required env vars: BAK_REMOTE_BASE_DIR BAK_USER_HOST&quot;
-  exit 1
-fi
-
-keep=50
-date_str=&quot;$(date -I)-$(date +%s)&quot;  # YYYY-MM-DD-EPOCH
-excludes=&quot;--exclude builds --exclude lastStable --exclude lastSuccessful --exclude fingerprints --exclude jobs-* --exclude temp --exclude tools --exclude checkout&quot;
-ssh $BAK_USER_HOST &quot;mkdir -vp $BAK_REMOTE_BASE_DIR/$date_str&quot;
-rsync -avE $excludes /var/lib/jenkins/ $BAK_USER_HOST:$BAK_REMOTE_BASE_DIR/$date_str
-ssh $BAK_USER_HOST &quot;(cd $BAK_REMOTE_BASE_DIR; ls -1tr | head -n -$keep | xargs rm -rf;)&quot;
+      <command>#!/bin/bash -eux
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+. $OSCI_ROOT/run/job-parts/build_bak.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deploy/jobs-static/_bootstrap'
=== added file 'deploy/jobs-static/_bootstrap/config.xml'
--- deploy/jobs-static/_bootstrap/config.xml	1970-01-01 00:00:00 +0000
+++ deploy/jobs-static/_bootstrap/config.xml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Use to initialize tools branches on master and slave nodes.  Chicken, egg, chicken.  Gotta have code there for the other jobs to call.</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>100</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
+          <name></name>
+          <description></description>
+          <allowedSlaves>
+            <string>master</string>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </allowedSlaves>
+          <defaultSlaves>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </defaultSlaves>
+          <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
+          <allowMultiNodeSelection>true</allowMultiNodeSelection>
+          <triggerConcurrentBuilds>true</triggerConcurrentBuilds>
+          <ignoreOfflineNodes>false</ignoreOfflineNodes>
+          <nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
+        </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>6</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>45 23 * * *</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -uex
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+. ${OSCI_ROOT}/run/job-parts/osci_job_common.sh
+${OSCI_ROOT}/run/job-parts/build_juju_bootstrap.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/_bucket_junk_cleanup' => 'deploy/jobs-static/_bucket_junk_cleanup'
=== modified file 'deploy/jobs-static/_bucket_junk_cleanup/config.xml'
--- deployment/jobs/_bucket_junk_cleanup/config.xml	2016-09-21 19:36:25 +0000
+++ deploy/jobs-static/_bucket_junk_cleanup/config.xml	2017-05-27 00:22:36 +0000
@@ -28,7 +28,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave||lab</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -41,33 +41,22 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-fi
-echo &quot;UOSCI revno: $(bzr revno $OSCI_ROOT)&quot;
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_bucket_junk_cleanup.sh
-</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_bucket_junk_cleanup.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
       <runAtStart>true</runAtStart>
       <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== renamed directory 'deployment/jobs/_bucket_reset_object_headers' => 'deploy/jobs-static/_bucket_reset_object_headers'
=== modified file 'deploy/jobs-static/_bucket_reset_object_headers/config.xml'
--- deployment/jobs/_bucket_reset_object_headers/config.xml	2016-05-19 21:18:38 +0000
+++ deploy/jobs-static/_bucket_reset_object_headers/config.xml	2017-05-27 00:22:36 +0000
@@ -3,14 +3,20 @@
   <actions/>
   <description>Not scheduled.  Use to reset .txt and .html content-type object headers in the swift/radosgw container.&#xd;
 </description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>100</numToKeep>
-    <artifactDaysToKeep>90</artifactDaysToKeep>
-    <artifactNumToKeep>90</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>100</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -20,20 +26,19 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>2</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -43,89 +48,24 @@
   <builders>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-fi
-echo &quot;UOSCI revno: $(bzr revno $OSCI_ROOT)&quot;
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_bucket_reset_object_headers.sh
 </command>
     </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-#${OSCI_ROOT}/job-parts/build_bucket_reset_object_headers.sh
-
-. ${OSCI_ROOT}/job-parts/osci_job_common.sh
-f_skip_juju_lxc
-
-f_gerrit_set_blob_vars
-env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort
-f_novarc_undercloud
-
-function bucket_reset_txt_html_object_headers(){
-  # This is a quick and dirty fix to set object header data in radosgw/swift container.
-  # Objects uploaded with &gt;= liberty clients are likely set as binary content-type
-
-  [[ -z &quot;$OBJECT_MATCH_PATTERN&quot; ]] &amp;&amp; export OBJECT_MATCH_PATTERN=&quot;&quot;
-
-  f_line &quot;Updating *.txt and *.html content-type object headers&quot;
-
-  work_dir=&quot;$(mktemp -d)&quot;
-  tmp_object_list=&quot;$(mktemp)&quot;
-
-  echo &quot; . Selecting .txt and .html files in $UOSCI_BUCKET_NAME...&quot;
-  echo &quot; . OBJECT_MATCH_PATTERN:  $OBJECT_MATCH_PATTERN&quot;
-  swift list $UOSCI_BUCKET_NAME | egrep &quot;.txt$|.html$&quot; | grep &quot;$OBJECT_MATCH_PATTERN&quot; &gt; $tmp_object_list ||:
-
-  if [[ &quot;$(wc -l $tmp_object_list)&quot; == &quot;0 $tmp_object_list&quot; ]]; then
-    echo &quot; . No objects found to update&quot;
-  fi
-
-  cd $work_dir
-
-  while read -r line; do
-    # Trim whitespace if it exists
-    line=&quot;$(echo $line | sed &apos;s/^[ \t]*//;s/[ \t]*$//&apos;)&quot;
-
-    # Update object
-    if [[ -n &quot;$line&quot; ]]; then
-      echo &quot; - Updating object:  $line&quot;
-      if [[ &quot;$line&quot; == *.html ]]; then
-        swift post $UOSCI_BUCKET_NAME $line -H &quot;content-type:text/html&quot;
-      elif [[ &quot;$line&quot; == *.txt ]]; then
-        swift post $UOSCI_BUCKET_NAME $line -H &quot;content-type:text/plain&quot;
-      else
-        echo &quot; ! Ignoring:  $line&quot;
-      fi
-    else
-      # Let&apos;s not modify the container itself!
-      echo &quot; ! Skipping dangerous variable as read: $line&quot;
-    fi
-  done &lt; &quot;$tmp_object_list&quot;
-
-  rm -fv $tmp_object_list
-
-  f_line &quot;END: Updating txt and html object headers&quot;
-}
-
-bucket_reset_txt_html_object_headers
-
-f_nice_finish
-f_check_fail</command>
-    </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/_bucket_update_indices' => 'deploy/jobs-static/_bucket_update_indices'
=== modified file 'deploy/jobs-static/_bucket_update_indices/config.xml'
--- deployment/jobs/_bucket_update_indices/config.xml	2016-09-21 19:36:25 +0000
+++ deploy/jobs-static/_bucket_update_indices/config.xml	2017-05-27 00:22:36 +0000
@@ -24,49 +24,41 @@
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>master||slave||lab</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H/10 * * * *</spec>
+      <spec>H * * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-fi
-echo &quot;UOSCI revno: $(bzr revno $OSCI_ROOT)&quot;
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+. $OSCI_ROOT/run/job-parts/build_bucket_update_indices.sh
 </command>
     </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_bucket_update_indices.sh</command>
-    </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
       <runAtStart>true</runAtStart>
       <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== added directory 'deploy/jobs-static/_destroy_controller'
=== added file 'deploy/jobs-static/_destroy_controller/config.xml'
--- deploy/jobs-static/_destroy_controller/config.xml	1970-01-01 00:00:00 +0000
+++ deploy/jobs-static/_destroy_controller/config.xml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>100</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
+          <name></name>
+          <description></description>
+          <allowedSlaves>
+            <string>master</string>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </allowedSlaves>
+          <defaultSlaves>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </defaultSlaves>
+          <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
+          <allowMultiNodeSelection>true</allowMultiNodeSelection>
+          <triggerConcurrentBuilds>true</triggerConcurrentBuilds>
+          <ignoreOfflineNodes>false</ignoreOfflineNodes>
+          <nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
+        </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>32</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>00 0 * * 5</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -uex
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+. ${OSCI_ROOT}/run/job-parts/osci_job_common.sh
+${OSCI_ROOT}/run/job-parts/build_juju_destroy_controller.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deploy/jobs-static/_destroy_model'
=== added file 'deploy/jobs-static/_destroy_model/config.xml'
--- deploy/jobs-static/_destroy_model/config.xml	1970-01-01 00:00:00 +0000
+++ deploy/jobs-static/_destroy_model/config.xml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>100</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
+          <name></name>
+          <description></description>
+          <allowedSlaves>
+            <string>master</string>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </allowedSlaves>
+          <defaultSlaves>
+            <string>osci-lab-0</string>
+            <string>osci-lab-1</string>
+            <string>osci-lab-2</string>
+            <string>osci-lab-3</string>
+            <string>osci-slave-0</string>
+            <string>osci-slave-1</string>
+            <string>osci-slave-10</string>
+            <string>osci-slave-11</string>
+            <string>osci-slave-2</string>
+            <string>osci-slave-3</string>
+            <string>osci-slave-4</string>
+            <string>osci-slave-5</string>
+            <string>osci-slave-6</string>
+            <string>osci-slave-7</string>
+            <string>osci-slave-8</string>
+            <string>osci-slave-9</string>
+          </defaultSlaves>
+          <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
+          <allowMultiNodeSelection>true</allowMultiNodeSelection>
+          <triggerConcurrentBuilds>true</triggerConcurrentBuilds>
+          <ignoreOfflineNodes>false</ignoreOfflineNodes>
+          <nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
+        </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>32</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>H 23 * * *</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -uex
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+. ${OSCI_ROOT}/run/job-parts/osci_job_common.sh
+${OSCI_ROOT}/run/job-parts/build_juju_destroy_model.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/_no_op' => 'deploy/jobs-static/_no_op'
=== modified file 'deploy/jobs-static/_no_op/config.xml'
--- deployment/jobs/_no_op/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/_no_op/config.xml	2017-05-27 00:22:36 +0000
@@ -43,9 +43,7 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>20</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -54,7 +52,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>task</assignedNode>
+  <assignedNode>task||slave</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -63,160 +61,14 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-
-function f_tool_refresh_osci() {
-# ubuntu_openstack_ci fresh
-  [[ -z &quot;$OSCI_REPO&quot; ]] &amp;&amp; export OSCI_REPO=&quot;lp:ubuntu-openstack-ci&quot;
-  export OSCI_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/ubuntu-openstack-ci&quot;
-
-  if [[ -d $OSCI_ROOT ]]; then
-    echo &quot; - Removing existing checkout @ $OSCI_ROOT&quot;
-    rm -rf $OSCI_ROOT
-  fi
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  mkdir -p $OSCI_ROOT
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-}
-
-
-function f_tool_refresh_oct() {
-# keep openstack_charm_testing fresh
-  [[ -z &quot;$OPENSTACK_CHARM_TESTING_REPO&quot; ]] &amp;&amp; export OPENSTACK_CHARM_TESTING_REPO=&quot;lp:openstack-charm-testing&quot;
-  export OPENSTACK_CHARM_TESTING_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/openstack-charm-testing&quot;
-
-  if [[ -d $OPENSTACK_CHARM_TESTING_ROOT ]]; then
-    echo &quot; - Removing existing checkout of @ $OPENSTACK_CHARM_TESTING_ROOT&quot;
-    rm -rf $OPENSTACK_CHARM_TESTING_ROOT
-  fi
-  echo &quot; + Creating new lightweight checkout of $OPENSTACK_CHARM_TESTING_REPO @ $OPENSTACK_CHARM_TESTING_ROOT.&quot;
-  mkdir -p $OPENSTACK_CHARM_TESTING_ROOT
-  bzr co --lightweight $OPENSTACK_CHARM_TESTING_REPO $OPENSTACK_CHARM_TESTING_ROOT
-  echo &quot;revno: $(bzr revno $OPENSTACK_CHARM_TESTING_ROOT)&quot;
-}
-
-
-function f_tool_refresh_juju_wait() {
-# keep juju_wait fresh
-  [[ -z &quot;$JUJU_WAIT_REPO&quot; ]] &amp;&amp; export JUJU_WAIT_REPO=&quot;https://git.launchpad.net/juju-wait&quot;
-  [[ -z &quot;$JUJU_WAIT_BRANCH&quot; ]] &amp;&amp; export JUJU_WAIT_BRANCH=&quot;master&quot;
-  export JUJU_WAIT_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/juju-wait&quot;
-  
-  if [[ -d $JUJU_WAIT_ROOT ]]; then
-    echo &quot; - Removing existing dir @ $JUJU_WAIT_ROOT&quot;
-    rm -rf $JUJU_WAIT_ROOT
-  fi
-
-  echo &quot; + Creating new shallow clone of $JUJU_WAIT_REPO @ $JUJU_WAIT_ROOT ($JUJU_WAIT_BRANCH).&quot;
-  mkdir -p $JUJU_WAIT_BRANCH
-  git clone -q --depth=1 $JUJU_WAIT_REPO $JUJU_WAIT_ROOT -b $JUJU_WAIT_BRANCH
-  git -C $JUJU_WAIT_ROOT branch -av
-  git -C $JUJU_WAIT_ROOT remote -v
-}
-
-
-function f_tool_refresh_migration_tools() {
-# Git the migration tools
-  [[ -z &quot;$UOSCI_MIG_TOOLS_REPO&quot; ]] &amp;&amp; export UOSCI_MIG_TOOLS_REPO=&quot;https://github.com/openstack-charmers/migration-tools&quot;
-  [[ -z &quot;$UOSCI_MIG_TOOLS_BRANCH&quot; ]] &amp;&amp; export UOSCI_MIG_TOOLS_BRANCH=&quot;master&quot;
-  export UOSCI_MIG_TOOLS_ROOT=&quot;$HOME/tools/$EXECUTOR_NUMBER/migration-tools&quot;
-  
-  if [[ -d $UOSCI_MIG_TOOLS_ROOT ]]; then
-    echo &quot; - Removing existing dir @ $UOSCI_MIG_TOOLS_ROOT&quot;
-    rm -rf $UOSCI_MIG_TOOLS_ROOT
-  fi
-
-  echo &quot; + Creating new shallow clone of $UOSCI_MIG_TOOLS_REPO @ $UOSCI_MIG_TOOLS_ROOT ($UOSCI_MIG_TOOLS_BRANCH).&quot;
-  mkdir -p $UOSCI_MIG_TOOLS_BRANCH
-  git clone -q --depth=1 $UOSCI_MIG_TOOLS_REPO $UOSCI_MIG_TOOLS_ROOT -b $UOSCI_MIG_TOOLS_BRANCH
-  git -C $UOSCI_MIG_TOOLS_ROOT branch -av
-  git -C $UOSCI_MIG_TOOLS_ROOT remote -v
-}
-
-
-function f_tool_refresh_bot_control() {
-# Git the bot-control repo
-  [[ -z &quot;$UOSCI_BOT_CONTROL_REPO&quot; ]] &amp;&amp; export UOSCI_BOT_CONTROL_REPO=&quot;https://github.com/openstack-charmers/bot-control.git&quot;
-  [[ -z &quot;$UOSCI_BOT_CONTROL_BRANCH&quot; ]] &amp;&amp; export UOSCI_BOT_CONTROL_BRANCH=&quot;master&quot;
-  export UOSCI_BOT_CONTROL_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/bot-control&quot;
-  
-  if [[ -d $UOSCI_BOT_CONTROL_ROOT ]]; then
-    echo &quot; - Removing existing dir @ $UOSCI_BOT_CONTROL_ROOT&quot;
-    rm -rf $UOSCI_BOT_CONTROL_ROOT
-  fi
-
-  echo &quot; + Creating new shallow clone of $UOSCI_BOT_CONTROL_REPO @ $UOSCI_BOT_CONTROL_ROOT ($UOSCI_BOT_CONTROL_BRANCH)&quot;
-  mkdir -p $UOSCI_BOT_CONTROL_BRANCH
-  git clone -q --depth=1 $UOSCI_BOT_CONTROL_REPO $UOSCI_BOT_CONTROL_ROOT -b $UOSCI_BOT_CONTROL_BRANCH
-  git -C $UOSCI_BOT_CONTROL_ROOT branch -av
-  git -C $UOSCI_BOT_CONTROL_ROOT remote -v
-}
-
-
-function f_tool_refresh_release_tools() {
-# Git the release-tools repo
-  [[ -z &quot;$UOSCI_RELEASE_TOOLS_REPO&quot; ]] &amp;&amp; export UOSCI_RELEASE_TOOLS_REPO=&quot;https://github.com/openstack-charmers/release-tools&quot;
-  [[ -z &quot;$UOSCI_RELEASE_TOOLS_BRANCH&quot; ]] &amp;&amp; export UOSCI_RELEASE_TOOLS_BRANCH=&quot;master&quot;
-  export UOSCI_RELEASE_TOOLS_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/release-tools&quot;
-
-  if [[ -d $UOSCI_RELEASE_TOOLS_ROOT ]]; then
-    echo &quot; - Removing existing dir @ $UOSCI_RELEASE_TOOLS_ROOT&quot;
-    rm -rf $UOSCI_RELEASE_TOOLS_ROOT
-  fi
-
-  echo &quot; + Creating shallow new clone of $UOSCI_RELEASE_TOOLS_REPO @ $UOSCI_RELEASE_TOOLS_ROOT ($UOSCI_RELEASE_TOOLS_BRANCH)&quot;
-  mkdir -p $UOSCI_RELEASE_TOOLS_BRANCH
-  git clone -q --depth=1 $UOSCI_RELEASE_TOOLS_REPO $UOSCI_RELEASE_TOOLS_ROOT -b $UOSCI_RELEASE_TOOLS_BRANCH
-  git -C $UOSCI_RELEASE_TOOLS_ROOT branch -av
-  git -C $UOSCI_RELEASE_TOOLS_ROOT remote -v
-}
-
-
-function f_tools_refresh() {
-  if [[ &quot;${NO_TOOLS_REFRESH^^}&quot; != &quot;TRUE&quot; ]]; then
-    echo &quot;Refreshing checkouts...&quot;
-    f_tool_refresh_osci
-    f_tool_refresh_migration_tools
-    f_tool_refresh_bot_control
-    f_tool_refresh_release_tools
-
-    if [[ &quot;${SKIP_JUJU_LXC^^}&quot; != &quot;TRUE&quot; ]]; then
-      f_tool_refresh_oct
-      f_tool_refresh_juju_wait
-    fi
-
-  else
-    echo &quot; - Not refreshing UOSCI &amp; O-C-T branches due to env var.&quot;
-  fi
-}
-
-f_tools_refresh
-
-
-###############
-
-env | sort
-
-###############
-
-. ${OSCI_ROOT}/job-parts/osci_job_common.sh
-f_line &quot;${OSCI_ROOT}/job-parts/osci_job_common.sh&quot;
-
-
-# Not expected to work on multi-executor slaves
-#f_line &quot;Flip-flopping Juju major versions&quot;
-#juju version
-#f_go_juju2
-#juju version
-#f_go_juju1
-#juju version
-
-###############
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot.sh
 
 uname -a
 uptime
-date &gt; $WORKSPACE/foo.txt</command>
+date &gt; $WORKSPACE/foo.txt
+sleep 4</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -230,14 +82,14 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;} @ ${ENV,var=&quot;NODE_NAME&quot;}:${ENV,var=&quot;EXECUTOR_NUMBER&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;} @ ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
       <runAtStart>true</runAtStart>
       <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== renamed directory 'deployment/jobs/_no_op2' => 'deploy/jobs-static/_no_op2'
=== modified file 'deploy/jobs-static/_no_op2/config.xml'
--- deployment/jobs/_no_op2/config.xml	2016-07-08 20:38:03 +0000
+++ deploy/jobs-static/_no_op2/config.xml	2017-05-27 00:22:36 +0000
@@ -2,14 +2,20 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>90</artifactDaysToKeep>
-    <artifactNumToKeep>90</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>30</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -29,20 +35,19 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>4</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task||slave</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -55,7 +60,7 @@
 uname -a
 uptime
 date &gt; $WORKSPACE/foo.txt
-sleep 3
+sleep 8
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -66,17 +71,20 @@
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;} @ ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/_no_op3' => 'deploy/jobs-static/_no_op3'
=== modified file 'deploy/jobs-static/_no_op3/config.xml'
--- deployment/jobs/_no_op3/config.xml	2016-07-08 20:38:03 +0000
+++ deploy/jobs-static/_no_op3/config.xml	2017-05-27 00:22:36 +0000
@@ -2,14 +2,20 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>90</artifactDaysToKeep>
-    <artifactNumToKeep>90</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>30</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>90</artifactDaysToKeep>
+        <artifactNumToKeep>90</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -29,20 +35,19 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>4</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task||slave</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -55,7 +60,7 @@
 uname -a
 uptime
 date &gt; $WORKSPACE/foo.txt
-sleep 2</command>
+sleep 10</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -65,17 +70,20 @@
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;} @ ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deploy/jobs-static/_none'
=== added file 'deploy/jobs-static/_none/config.xml'
--- deploy/jobs-static/_none/config.xml	1970-01-01 00:00:00 +0000
+++ deploy/jobs-static/_none/config.xml	2017-05-27 00:22:36 +0000
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>slave||lab</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -ex
+. ~/oscirc
+
+env | sort
+
+~/osci-repo-boot.sh
+
+tree -aL 4 $HOME
+
+ls -alh $OSCI_ROOT
+
+head $OSCI_ROOT/run/job-parts/build_none.sh
+
+$OSCI_ROOT/run/job-parts/build_none.sh || echo BAH!
+
+date
+
+uname -a</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/_system_tools_init' => 'deploy/jobs-static/_system_tools_init'
=== modified file 'deploy/jobs-static/_system_tools_init/config.xml'
--- deployment/jobs/_system_tools_init/config.xml	2017-04-05 11:51:52 +0000
+++ deploy/jobs-static/_system_tools_init/config.xml	2017-05-27 00:22:36 +0000
@@ -19,7 +19,7 @@
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
-          <name>Concurrent Multiple Nodes</name>
+          <name></name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
@@ -29,17 +29,10 @@
             <string>osci-lab-1</string>
             <string>osci-lab-2</string>
             <string>osci-lab-3</string>
-            <string>osci-mutuslab0</string>
-            <string>osci-mutuslab1</string>
-            <string>osci-mutuslab2</string>
             <string>osci-slave-0</string>
             <string>osci-slave-1</string>
             <string>osci-slave-10</string>
             <string>osci-slave-11</string>
-            <string>osci-slave-12</string>
-            <string>osci-slave-13</string>
-            <string>osci-slave-14</string>
-            <string>osci-slave-15</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -61,11 +54,9 @@
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
-      <throttleEnabled>false</throttleEnabled>
+      <maxConcurrentTotal>32</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
@@ -79,94 +70,22 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>45 23 * * *</spec>
+      <spec>30 23 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-#
-#  Common functions for UOSCI jobs, specific to refreshing tool branches.
-
-mkdir -vp /var/lib/jenkins/tools ||:
-
-
-function f_tool_refresh_osci() {
-# ubuntu_openstack_ci fresh
-  if [[ -d $OSCI_ROOT ]]; then
-    echo &quot; - Removing existing checkout @ $OSCI_ROOT&quot;
-    rm -rf $OSCI_ROOT
-  fi
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-}
-
-
-function f_tool_refresh_oct() {
-# keep openstack_charm_testing fresh
-  if [[ -d $OPENSTACK_CHARM_TESTING_ROOT ]]; then
-    echo &quot; - Removing existing checkout of @ $OPENSTACK_CHARM_TESTING_ROOT&quot;
-    rm -rf $OPENSTACK_CHARM_TESTING_ROOT
-  fi
-  echo &quot; + Creating new lightweight checkout of $OPENSTACK_CHARM_TESTING_REPO @ $OPENSTACK_CHARM_TESTING_ROOT.&quot;
-  bzr co --lightweight $OPENSTACK_CHARM_TESTING_REPO $OPENSTACK_CHARM_TESTING_ROOT
-  echo &quot;revno: $(bzr revno $OPENSTACK_CHARM_TESTING_ROOT)&quot;
-}
-
-
-function f_tool_refresh_juju_wait() {
-# keep juju_wait fresh
-  [[ -z &quot;$JUJU_WAIT_REPO&quot; ]] &amp;&amp; export JUJU_WAIT_REPO=&quot;https://git.launchpad.net/juju-wait&quot;
-  [[ -z &quot;$JUJU_WAIT_ROOT&quot; ]] &amp;&amp; export JUJU_WAIT_ROOT=&quot;${HOME}/tools/juju-wait&quot;
-  [[ -z &quot;$JUJU_WAIT_BRANCH&quot; ]] &amp;&amp; export JUJU_WAIT_BRANCH=&quot;master&quot;
-
-  if [[ -d $JUJU_WAIT_ROOT ]]; then
-    echo &quot; - Removing existing dir @ $JUJU_WAIT_ROOT&quot;
-    rm -rf $JUJU_WAIT_ROOT
-  fi
-
-  echo &quot; + Creating new shallow clone of $JUJU_WAIT_REPO @ $JUJU_WAIT_ROOT ($JUJU_WAIT_BRANCH).&quot;
-  git clone -q --depth=1 $JUJU_WAIT_REPO $JUJU_WAIT_ROOT -b $JUJU_WAIT_BRANCH
-  git -C $JUJU_WAIT_ROOT branch -av
-  git -C $JUJU_WAIT_ROOT remote -v
-}
-
-
-#function f_tool_refresh_tarmac() {
-# keep tarmac fresh
-#if [[ -d $TARMAC_ROOT ]]; then
-#  echo &quot; - Removing existing checkout @ $TARMAC_ROOT&quot;
-#  rm -rf $TARMAC_ROOT
-#fi
-#echo &quot; + Creating new lightweight checkout of $TARMAC_REPO @ $TARMAC_ROOT.&quot;
-#bzr co --lightweight $TARMAC_REPO $TARMAC_ROOT
-#}
-
-
-#function f_tool_refresh_osut() {
-# Dump juju package info to a file.
-# keep openstack_ubuntu_testing fresh
-#if [[ -d $OPENSTACK_UBUNTU_ROOT ]]; then
-#  echo &quot; - Removing existing checkout of @ $OPENSTACK_UBUNTU_ROOT&quot;
-#  rm -rf $OPENSTACK_UBUNTU_ROOT
-#fi
-#echo &quot; + Creating new lightweight checkout @ $OPENSTACK_UBUNTU_ROOT.&quot;
-#bzr co --lightweight $OPENSTACK_UBUNTU_REPO $OPENSTACK_UBUNTU_ROOT
-#}
-
-
-f_tool_refresh_osci
-f_tool_refresh_oct
-f_tool_refresh_juju_wait</command>
+      <command>#!/bin/bash -uex
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}-${ENV,var=&quot;EXECUTOR_NUMBER&quot;}</template>
       <runAtStart>true</runAtStart>
       <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== renamed directory 'deployment/jobs/charm_build' => 'deploy/jobs-static/charm_build'
=== modified file 'deploy/jobs-static/charm_build/config.xml'
--- deployment/jobs/charm_build/config.xml	2016-06-15 04:31:10 +0000
+++ deploy/jobs-static/charm_build/config.xml	2017-05-27 00:22:36 +0000
@@ -2,14 +2,20 @@
 <project>
   <actions/>
   <description>Build an asset and create an artifact archive file containing the built item.</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>720</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>30</artifactDaysToKeep>
+        <artifactNumToKeep>720</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -99,20 +105,19 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>12</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -121,20 +126,14 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_build_and_archive.sh</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_charm_build_and_archive.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -144,13 +143,14 @@
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
-    <jenkins.plugins.publish__over__ssh.BapSshPublisherPlugin plugin="publish-over-ssh@1.14">
+    <jenkins.plugins.publish__over__ssh.BapSshPublisherPlugin plugin="publish-over-ssh@1.17">
       <consolePrefix>SSH: </consolePrefix>
       <delegate>
         <publishers>
           <jenkins.plugins.publish__over__ssh.BapSshPublisher>
-            <configName>osci ephemeral (jenkins master)</configName>
+            <configName>osci-master ephemeral</configName>
             <verbose>false</verbose>
             <transfers>
               <jenkins.plugins.publish__over__ssh.BapSshTransfer>
@@ -167,6 +167,7 @@
                 <execCommand></execCommand>
                 <execTimeout>120000</execTimeout>
                 <usePty>false</usePty>
+                <useAgentForwarding>false</useAgentForwarding>
               </jenkins.plugins.publish__over__ssh.BapSshTransfer>
             </transfers>
             <useWorkspaceInPromotion>false</useWorkspaceInPromotion>
@@ -181,14 +182,16 @@
     </jenkins.plugins.publish__over__ssh.BapSshPublisherPlugin>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/sim_sandbox_pipeline' => 'deploy/jobs-static/sim_sandbox_pipeline'
=== modified file 'deploy/jobs-static/sim_sandbox_pipeline/config.xml'
--- deployment/jobs/sim_sandbox_pipeline/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/sim_sandbox_pipeline/config.xml	2017-05-27 00:22:36 +0000
@@ -87,19 +87,16 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>4</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -108,7 +105,7 @@
     <hudson.triggers.TimerTrigger>
       <spec>H 0 * * *</spec>
     </hudson.triggers.TimerTrigger>
-    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.18.3">
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.23.1">
       <spec></spec>
       <gerritProjects>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
@@ -137,6 +134,7 @@
       <dependencyJobsNames></dependencyJobsNames>
       <commitMessageParameterMode>BASE64</commitMessageParameterMode>
       <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
+      <commentTextParameterMode>PLAIN</commentTextParameterMode>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
@@ -144,7 +142,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>review.openstack.org</serverName>
+      <serverName>__ANY__</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
@@ -169,18 +167,12 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+
+set -x
+sleep 8</command>
     </hudson.tasks.Shell>
     <org.jenkinsci.plugins.conditionalbuildstep.ConditionalBuilder plugin="conditional-buildstep@1.3.5">
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -199,7 +191,7 @@
         </bestResult>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -208,6 +200,7 @@
               <projects>sim_sub_a,sim_sub_b</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -227,10 +220,15 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/sim_sub_a/$TRIGGERED_BUILD_NUMBER_sim_sub_a/consoleText -O $WORKSPACE/consoleText.sim_sub_a.txt
-wget ${JENKINS_URL}job/sim_sub_b/$TRIGGERED_BUILD_NUMBER_sim_sub_b/consoleText -O $WORKSPACE/consoleText.sim_sub_b.txt</command>
+          <command>#!/bin/bash -uex
+. ~/oscirc
+
+set -x
+sleep 8
+
+env | egrep &quot;JENKINS|TRIGGERED_BUILD&quot;
+wget http://${OSCI_MASTER_IP}:8080/job/sim_sub_a/$TRIGGERED_BUILD_NUMBER_sim_sub_a/consoleText -O $WORKSPACE/consoleText.sim_sub_a.txt
+wget http://${OSCI_MASTER_IP}:8080/job/sim_sub_b/$TRIGGERED_BUILD_NUMBER_sim_sub_b/consoleText -O $WORKSPACE/consoleText.sim_sub_b.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>sim_sub_a</project>
@@ -273,7 +271,7 @@
         </bestResult>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -282,6 +280,7 @@
               <projects>sim_sub_c</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -301,9 +300,14 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/sim_sub_c/$TRIGGERED_BUILD_NUMBER_sim_sub_c/consoleText -O $WORKSPACE/consoleText.sim_sub_c.txt</command>
+          <command>#!/bin/bash -uex
+. ~/oscirc
+
+set -x
+sleep 8
+
+env | egrep &quot;JENKINS|TRIGGERED_BUILD&quot;
+wget http://${OSCI_MASTER_IP}:8080/job/sim_sub_c/$TRIGGERED_BUILD_NUMBER_sim_sub_c/consoleText -O $WORKSPACE/consoleText.sim_sub_c.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>sim_sub_c</project>
@@ -335,7 +339,7 @@
         </bestResult>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -344,6 +348,7 @@
               <projects>sim_sub_d</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -363,9 +368,14 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
+          <command>#!/bin/bash -ue
+. ~/oscirc
+
+set -x
+sleep 8
+
 env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/sim_sub_d/$TRIGGERED_BUILD_NUMBER_sim_sub_d/consoleText -O $WORKSPACE/consoleText.sim_sub_d.txt</command>
+wget http://${OSCI_MASTER_IP}:8080/job/sim_sub_d/$TRIGGERED_BUILD_NUMBER_sim_sub_d/consoleText -O $WORKSPACE/consoleText.sim_sub_d.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>sim_sub_d</project>
@@ -396,9 +406,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;SUCCESS&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh</command>
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh</command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
     </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
@@ -418,9 +429,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;FAILURE&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -437,12 +449,12 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sandbox_pipeline_full' => 'deploy/jobs-static/sim_sandbox_pipeline_full'
=== modified file 'deploy/jobs-static/sim_sandbox_pipeline_full/config.xml'
--- deployment/jobs/sim_sandbox_pipeline_full/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/sim_sandbox_pipeline_full/config.xml	2017-05-27 00:22:36 +0000
@@ -77,25 +77,22 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>4</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
-    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.18.3">
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.23.1">
       <spec></spec>
       <gerritProjects>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
@@ -124,6 +121,7 @@
       <dependencyJobsNames></dependencyJobsNames>
       <commitMessageParameterMode>BASE64</commitMessageParameterMode>
       <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
+      <commentTextParameterMode>PLAIN</commentTextParameterMode>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
@@ -142,7 +140,7 @@
           <commentAddedCommentContains>^Patch Set.*charm-recheck-full$</commentAddedCommentContains>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
-          <verdictCategory>Code-Review</verdictCategory>
+          <verdictCategory>Verified</verdictCategory>
           <commentAddedTriggerApprovalValue>1</commentAddedTriggerApprovalValue>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
       </triggerOnEvents>
@@ -154,18 +152,12 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot.sh</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
+      <command>#!/bin/bash -ue
 env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort
 
 echo &quot; . Always-run step 0&quot;</command>
@@ -188,7 +180,7 @@
       </runCondition>
       <conditionalbuilders>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
+          <command>#!/bin/bash -ue
 echo &quot; . Conditional step 1&quot;</command>
         </hudson.tasks.Shell>
       </conditionalbuilders>
@@ -211,7 +203,7 @@
       </runCondition>
       <conditionalbuilders>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
+          <command>#!/bin/bash -ue
 echo &quot; . Conditional step 2&quot;</command>
         </hudson.tasks.Shell>
       </conditionalbuilders>
@@ -234,7 +226,7 @@
       </runCondition>
       <conditionalbuilders>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
+          <command>#!/bin/bash -ue
 echo &quot; . Conditional step 3&quot;</command>
         </hudson.tasks.Shell>
       </conditionalbuilders>
@@ -255,9 +247,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;SUCCESS&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh</command>
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh</command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
     </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
@@ -277,9 +270,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;FAILURE&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh</command>
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh</command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
     </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
@@ -295,12 +289,12 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sub_a' => 'deploy/jobs-static/sim_sub_a'
=== modified file 'deploy/jobs-static/sim_sub_a/config.xml'
--- deployment/jobs/sim_sub_a/config.xml	2016-10-04 02:28:38 +0000
+++ deploy/jobs-static/sim_sub_a/config.xml	2017-05-27 00:22:36 +0000
@@ -93,9 +93,7 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -104,7 +102,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -113,19 +111,10 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>${OSCI_ROOT}/job-parts/build_simulate.sh</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot.sh
+${OSCI_ROOT}/run/job-parts/build_simulate.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -139,7 +128,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sub_b' => 'deploy/jobs-static/sim_sub_b'
=== modified file 'deploy/jobs-static/sim_sub_b/config.xml'
--- deployment/jobs/sim_sub_b/config.xml	2016-10-04 02:28:38 +0000
+++ deploy/jobs-static/sim_sub_b/config.xml	2017-05-27 00:22:36 +0000
@@ -83,9 +83,7 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -94,7 +92,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -103,19 +101,11 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>set -x
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot.sh
+
+set -x
 mkdir -vp $WORKSPACE/logs
 mkdir -vp $WORKSPACE/other
 date &gt; $WORKSPACE/logs/file1.txt
@@ -129,10 +119,9 @@
 
 cat $WORKSPACE/logs/file1.txt
 cat $WORKSPACE/other/file1.txt
-ls $WORKSPACE -alr</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>${OSCI_ROOT}/job-parts/build_simulate.sh
+ls $WORKSPACE -alr
+
+${OSCI_ROOT}/run/job-parts/build_simulate.sh
 
 ls $WORKSPACE -alr</command>
     </hudson.tasks.Shell>
@@ -148,7 +137,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sub_c' => 'deploy/jobs-static/sim_sub_c'
=== modified file 'deploy/jobs-static/sim_sub_c/config.xml'
--- deployment/jobs/sim_sub_c/config.xml	2016-10-04 02:28:38 +0000
+++ deploy/jobs-static/sim_sub_c/config.xml	2017-05-27 00:22:36 +0000
@@ -81,11 +81,9 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -94,7 +92,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -103,19 +101,10 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>${OSCI_ROOT}/job-parts/build_simulate.sh</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_simulate.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -129,7 +118,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sub_d' => 'deploy/jobs-static/sim_sub_d'
=== modified file 'deploy/jobs-static/sim_sub_d/config.xml'
--- deployment/jobs/sim_sub_d/config.xml	2016-10-04 02:28:38 +0000
+++ deploy/jobs-static/sim_sub_d/config.xml	2017-05-27 00:22:36 +0000
@@ -81,11 +81,9 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentPerNode>4</maxConcurrentPerNode>
+      <maxConcurrentTotal>4</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -94,7 +92,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -103,19 +101,10 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>${OSCI_ROOT}/job-parts/build_simulate.sh</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot.sh
+${OSCI_ROOT}/run/job-parts/build_simulate.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -129,7 +118,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;},${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} for ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/sim_sub_e' => 'deploy/jobs-static/sim_sub_e'
=== modified file 'deploy/jobs-static/sim_sub_e/config.xml'
--- deployment/jobs/sim_sub_e/config.xml	2016-10-04 02:28:38 +0000
+++ deploy/jobs-static/sim_sub_e/config.xml	2017-05-27 00:22:36 +0000
@@ -66,11 +66,9 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentPerNode>24</maxConcurrentPerNode>
+      <maxConcurrentTotal>24</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -79,7 +77,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -88,19 +86,10 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>${OSCI_ROOT}/job-parts/build_simulate.sh</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_simulate.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -114,7 +103,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_amulet_full' => 'deploy/jobs-static/test_charm_amulet_full'
=== modified file 'deploy/jobs-static/test_charm_amulet_full/config.xml'
--- deployment/jobs/test_charm_amulet_full/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/test_charm_amulet_full/config.xml	2017-05-27 00:22:36 +0000
@@ -122,10 +122,8 @@
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentTotal>5</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -143,21 +141,15 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
 </command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_amulet_test.sh
-</command>
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_amulet_test.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -171,7 +163,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_amulet_smoke' => 'deploy/jobs-static/test_charm_amulet_smoke'
=== modified file 'deploy/jobs-static/test_charm_amulet_smoke/config.xml'
--- deployment/jobs/test_charm_amulet_smoke/config.xml	2016-06-15 04:31:10 +0000
+++ deploy/jobs-static/test_charm_amulet_smoke/config.xml	2017-05-27 00:22:36 +0000
@@ -2,14 +2,20 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>500</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>30</artifactDaysToKeep>
+        <artifactNumToKeep>500</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -122,15 +128,14 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>5</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
@@ -144,21 +149,16 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_amulet_smoke.sh
 </command>
     </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_amulet_smoke.sh</command>
-    </hudson.tasks.Shell>
   </builders>
   <publishers>
     <hudson.tasks.ArtifactArchiver>
@@ -167,12 +167,15 @@
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== renamed directory 'deployment/jobs/test_charm_lint' => 'deploy/jobs-static/test_charm_lint'
=== modified file 'deploy/jobs-static/test_charm_lint/config.xml'
--- deployment/jobs/test_charm_lint/config.xml	2016-09-21 19:36:25 +0000
+++ deploy/jobs-static/test_charm_lint/config.xml	2017-05-27 00:22:36 +0000
@@ -121,8 +121,8 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>24</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -132,7 +132,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave||lab</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -141,20 +141,11 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_lint_test.sh
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_lint_test.sh
+
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -169,7 +160,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_pipeline' => 'deploy/jobs-static/test_charm_pipeline'
=== modified file 'deploy/jobs-static/test_charm_pipeline/config.xml'
--- deployment/jobs/test_charm_pipeline/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/test_charm_pipeline/config.xml	2017-05-27 00:22:36 +0000
@@ -14,8 +14,8 @@
   &lt;li&gt;(test_charm_unit + test_charm_lint)&lt;/li&gt;&#xd;
   &lt;li&gt;test_charm_single&lt;/li&gt;&#xd;
   &lt;li&gt;test_charm_amulet_smoke&lt;/li&gt;&#xd;
-  &lt;li&gt;WIP!: test_charm_amulet_full&lt;/li&gt;&#xd;
-  &lt;li&gt;artiface collection&lt;/li&gt;&#xd;
+  &lt;li&gt;test_charm_amulet_full&lt;/li&gt;&#xd;
+  &lt;li&gt;artifact collection&lt;/li&gt;&#xd;
   &lt;li&gt;gerrit review posting and/or report upload to bucket&lt;/li&gt;&#xd;
 &lt;/ol&gt;</description>
   <keepDependencies>false</keepDependencies>
@@ -117,27 +117,24 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>12</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
-    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.18.3">
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.23.1">
       <spec></spec>
       <gerritProjects>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
@@ -166,6 +163,7 @@
       <dependencyJobsNames></dependencyJobsNames>
       <commitMessageParameterMode>BASE64</commitMessageParameterMode>
       <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
+      <commentTextParameterMode>PLAIN</commentTextParameterMode>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
@@ -198,29 +196,22 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
-      <command>env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort</command>
+      <command># env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort</command>
     </hudson.tasks.Shell>
     <org.jenkinsci.plugins.conditionalbuildstep.ConditionalBuilder plugin="conditional-buildstep@1.3.5">
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
       <runCondition class="org.jenkins_ci.plugins.run_condition.core.AlwaysRun" plugin="run-condition@1.0"/>
       <conditionalbuilders>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-#
+          <command>#!/bin/bash -ue
 #  Inspect repo and prescribe things to do
-
-${OSCI_ROOT}/job-parts/build_prescribe.sh</command>
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_prescribe.sh</command>
         </hudson.tasks.Shell>
       </conditionalbuilders>
     </org.jenkinsci.plugins.conditionalbuildstep.ConditionalBuilder>
@@ -241,7 +232,7 @@
         </bestResult>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -250,6 +241,7 @@
               <projects>test_charm_lint,test_charm_unit</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -269,10 +261,11 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt
-wget ${JENKINS_URL}job/test_charm_unit/$TRIGGERED_BUILD_NUMBER_test_charm_unit/consoleText -O $WORKSPACE/consoleText.test_charm_unit_${TRIGGERED_BUILD_NUMBER_test_charm_unit}.txt</command>
+          <command>#!/bin/bash -ue
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_unit/$TRIGGERED_BUILD_NUMBER_test_charm_unit/consoleText -O $WORKSPACE/consoleText.test_charm_unit_${TRIGGERED_BUILD_NUMBER_test_charm_unit}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_lint</project>
@@ -305,7 +298,7 @@
         <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -314,6 +307,7 @@
               <projects>charm_build</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -333,9 +327,10 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/charm_build/$TRIGGERED_BUILD_NUMBER_charm_build/consoleText -O $WORKSPACE/consoleText.charm_build_${TRIGGERED_BUILD_NUMBER_charm_build}.txt</command>
+          <command>#!/bin/bash -ue
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/charm_build/$TRIGGERED_BUILD_NUMBER_charm_build/consoleText -O $WORKSPACE/consoleText.charm_build_${TRIGGERED_BUILD_NUMBER_charm_build}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>charm_build</project>
@@ -358,7 +353,7 @@
         <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -373,6 +368,7 @@
               <projects>test_charm_lint</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -392,9 +388,10 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt</command>
+          <command>#!/bin/bash -ue
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_lint</project>
@@ -438,7 +435,7 @@
         </conditions>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -453,6 +450,7 @@
               <projects>test_charm_single</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -472,9 +470,10 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_single/$TRIGGERED_BUILD_NUMBER_test_charm_single/consoleText -O $WORKSPACE/consoleText.test_charm_single_${TRIGGERED_BUILD_NUMBER_test_charm_single}.txt</command>
+          <command>#!/bin/bash -ue
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_single/$TRIGGERED_BUILD_NUMBER_test_charm_single/consoleText -O $WORKSPACE/consoleText.test_charm_single_${TRIGGERED_BUILD_NUMBER_test_charm_single}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_single</project>
@@ -518,7 +517,7 @@
         </conditions>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -533,6 +532,7 @@
               <projects>test_charm_amulet_smoke</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -552,9 +552,10 @@
           </configs>
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
-          <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_amulet_smoke/$TRIGGERED_BUILD_NUMBER_test_charm_amulet_smoke/consoleText -O $WORKSPACE/consoleText.test_charm_amulet_smoke_${TRIGGERED_BUILD_NUMBER_test_charm_amulet_smoke}.txt</command>
+          <command>#!/bin/bash -ue
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_amulet_smoke/$TRIGGERED_BUILD_NUMBER_test_charm_amulet_smoke/consoleText -O $WORKSPACE/consoleText.test_charm_amulet_smoke_${TRIGGERED_BUILD_NUMBER_test_charm_amulet_smoke}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_amulet_smoke</project>
@@ -585,9 +586,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;SUCCESS&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -608,9 +610,10 @@
         </bestResult>
       </condition>
       <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash -e
+        <command>#!/bin/bash -ue
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;FAILURE&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -627,12 +630,12 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_pipeline_amulet_full' => 'deploy/jobs-static/test_charm_pipeline_amulet_full'
=== modified file 'deploy/jobs-static/test_charm_pipeline_amulet_full/config.xml'
--- deployment/jobs/test_charm_pipeline_amulet_full/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/test_charm_pipeline_amulet_full/config.xml	2017-05-27 00:22:36 +0000
@@ -116,27 +116,24 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>6</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>12</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
-    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.18.3">
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.23.1">
       <spec></spec>
       <gerritProjects>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
@@ -165,6 +162,7 @@
       <dependencyJobsNames></dependencyJobsNames>
       <commitMessageParameterMode>BASE64</commitMessageParameterMode>
       <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
+      <commentTextParameterMode>PLAIN</commentTextParameterMode>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
@@ -186,18 +184,12 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi</command>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
-      <command>env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort</command>
+      <command># env | egrep &quot;BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE&quot; | sort</command>
     </hudson.tasks.Shell>
     <org.jenkinsci.plugins.conditionalbuildstep.ConditionalBuilder plugin="conditional-buildstep@1.3.5">
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -205,10 +197,11 @@
       <conditionalbuilders>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
+. ~/oscirc
 #
 #  Inspect repo and prescribe things to do
-
-${OSCI_ROOT}/job-parts/build_prescribe.sh</command>
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_prescribe.sh</command>
         </hudson.tasks.Shell>
       </conditionalbuilders>
     </org.jenkinsci.plugins.conditionalbuildstep.ConditionalBuilder>
@@ -229,7 +222,7 @@
         </bestResult>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -238,6 +231,7 @@
               <projects>test_charm_lint,test_charm_unit</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -258,9 +252,10 @@
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt
-wget ${JENKINS_URL}job/test_charm_unit/$TRIGGERED_BUILD_NUMBER_test_charm_unit/consoleText -O $WORKSPACE/consoleText.test_charm_unit_${TRIGGERED_BUILD_NUMBER_test_charm_unit}.txt</command>
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_unit/$TRIGGERED_BUILD_NUMBER_test_charm_unit/consoleText -O $WORKSPACE/consoleText.test_charm_unit_${TRIGGERED_BUILD_NUMBER_test_charm_unit}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_lint</project>
@@ -293,7 +288,7 @@
         <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -302,6 +297,7 @@
               <projects>charm_build</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -322,8 +318,9 @@
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/charm_build/$TRIGGERED_BUILD_NUMBER_charm_build/consoleText -O $WORKSPACE/consoleText.charm_build_${TRIGGERED_BUILD_NUMBER_charm_build}.txt</command>
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/charm_build/$TRIGGERED_BUILD_NUMBER_charm_build/consoleText -O $WORKSPACE/consoleText.charm_build_${TRIGGERED_BUILD_NUMBER_charm_build}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>charm_build</project>
@@ -346,7 +343,7 @@
         <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -361,6 +358,7 @@
               <projects>test_charm_lint</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -381,8 +379,9 @@
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt</command>
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_lint/$TRIGGERED_BUILD_NUMBER_test_charm_lint/consoleText -O $WORKSPACE/consoleText.test_charm_lint_${TRIGGERED_BUILD_NUMBER_test_charm_lint}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_lint</project>
@@ -426,7 +425,7 @@
         </conditions>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -441,6 +440,7 @@
               <projects>test_charm_single</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -461,8 +461,9 @@
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_single/$TRIGGERED_BUILD_NUMBER_test_charm_single/consoleText -O $WORKSPACE/consoleText.test_charm_single_${TRIGGERED_BUILD_NUMBER_test_charm_single}.txt</command>
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_single/$TRIGGERED_BUILD_NUMBER_test_charm_single/consoleText -O $WORKSPACE/consoleText.test_charm_single_${TRIGGERED_BUILD_NUMBER_test_charm_single}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_single</project>
@@ -506,7 +507,7 @@
         </conditions>
       </runCondition>
       <conditionalbuilders>
-        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+        <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.33">
           <configs>
             <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
               <configs>
@@ -521,6 +522,7 @@
               <projects>test_charm_amulet_full</projects>
               <condition>ALWAYS</condition>
               <triggerWithNoParameters>false</triggerWithNoParameters>
+              <triggerFromChildProjects>false</triggerFromChildProjects>
               <block>
                 <unstableThreshold>
                   <name>UNSTABLE</name>
@@ -541,8 +543,9 @@
         </hudson.plugins.parameterizedtrigger.TriggerBuilder>
         <hudson.tasks.Shell>
           <command>#!/bin/bash -e
-env | grep TRIGGERED_BUILD
-wget ${JENKINS_URL}job/test_charm_amulet_full/$TRIGGERED_BUILD_NUMBER_test_charm_amulet_full/consoleText -O $WORKSPACE/consoleText.test_charm_amulet_full_${TRIGGERED_BUILD_NUMBER_test_charm_amulet_full}.txt</command>
+. ~/oscirc
+# env | grep TRIGGERED_BUILD
+wget http://${OSCI_MASTER_IP}:8080/job/test_charm_amulet_full/$TRIGGERED_BUILD_NUMBER_test_charm_amulet_full/consoleText -O $WORKSPACE/consoleText.test_charm_amulet_full_${TRIGGERED_BUILD_NUMBER_test_charm_amulet_full}.txt</command>
         </hudson.tasks.Shell>
         <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.38.1">
           <project>test_charm_amulet_full</project>
@@ -574,8 +577,9 @@
       </condition>
       <buildStep class="hudson.tasks.Shell">
         <command>#!/bin/bash -e
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;SUCCESS&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -597,8 +601,9 @@
       </condition>
       <buildStep class="hudson.tasks.Shell">
         <command>#!/bin/bash -e
+. ~/oscirc
 export UOSCI_GERRIT_VERDICT=&quot;FAILURE&quot;
-${OSCI_ROOT}/job-parts/part_gerrit_review.sh
+${OSCI_ROOT}/run/job-parts/part_gerrit_review.sh
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -615,12 +620,12 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_single' => 'deploy/jobs-static/test_charm_single'
=== modified file 'deploy/jobs-static/test_charm_single/config.xml'
--- deployment/jobs/test_charm_single/config.xml	2016-12-09 21:50:02 +0000
+++ deploy/jobs-static/test_charm_single/config.xml	2017-05-27 00:22:36 +0000
@@ -127,10 +127,8 @@
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList">
-        <string>false</string>
-      </categories>
+      <maxConcurrentTotal>16</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -139,7 +137,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>slave||lab</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -148,21 +146,16 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -ue
+. ~/oscirc
+${OSCI_ROOT}/run/job-parts/build_charm_single.sh
 </command>
     </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_single.sh</command>
-    </hudson.tasks.Shell>
   </builders>
   <publishers>
     <hudson.tasks.ArtifactArchiver>
@@ -175,7 +168,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== renamed directory 'deployment/jobs/test_charm_unit' => 'deploy/jobs-static/test_charm_unit'
=== modified file 'deploy/jobs-static/test_charm_unit/config.xml'
--- deployment/jobs/test_charm_unit/config.xml	2016-09-21 19:36:25 +0000
+++ deploy/jobs-static/test_charm_unit/config.xml	2017-05-27 00:22:36 +0000
@@ -121,8 +121,8 @@
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <maxConcurrentPerNode>8</maxConcurrentPerNode>
+      <maxConcurrentTotal>24</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -132,7 +132,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave||lab</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -141,20 +141,10 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-# Ensure we have a checkout of UOSCI code
-if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
-  echo &quot; - Removing checkout @ $OSCI_ROOT if it exists&quot;
-  rm -rf $OSCI_ROOT ||:
-  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
-  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
-  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
-fi
-</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_unit_test.sh
+      <command>#!/bin/bash -ue
+. ~/oscirc
+~/osci-repo-boot-clean.sh
+${OSCI_ROOT}/run/job-parts/build_unit_test.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -169,7 +159,7 @@
     </hudson.tasks.ArtifactArchiver>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;GERRIT_PROJECT&quot;} ${ENV,var=&quot;GERRIT_BRANCH&quot;} ${ENV,var=&quot;GERRIT_CHANGE_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_NUMBER&quot;} ${ENV,var=&quot;GERRIT_PATCHSET_UPLOADER_NAME&quot;} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;}</template>
       <runAtStart>true</runAtStart>

=== added directory 'deploy/lib'
=== added file 'deploy/lib/__init__.py'
--- deploy/lib/__init__.py	1970-01-01 00:00:00 +0000
+++ deploy/lib/__init__.py	2017-05-27 00:22:36 +0000
@@ -0,0 +1,3 @@
+'''
+osci-deploy common
+'''

=== added file 'deploy/lib/osci_deploy_helpers.py'
--- deploy/lib/osci_deploy_helpers.py	1970-01-01 00:00:00 +0000
+++ deploy/lib/osci_deploy_helpers.py	2017-05-27 00:22:36 +0000
@@ -0,0 +1,355 @@
+#!/usr/bin/env python3
+'''
+osci deploy helpers
+'''
+
+import logging
+import os
+import random
+import subprocess
+import string
+import yaml
+
+import keystoneauth1.identity.v3 as keystoneauth1
+import keystoneauth1.session as keystoneauth1_session
+from neutronclient.v2_0 import client as ne_client
+from jinja2 import Environment, FileSystemLoader
+
+
+JM_NAME_TEMPL = 'osci-master/{}'
+
+SLAVE_NAME_TEMPLATES = {
+    'slave': 'osci-slave/{}',  # jsv
+    'lab': 'osci-lab/{}',      # jlb
+    'task': 'osci-task/{}'     # jtk
+}
+
+
+def rnd_str(length=32):
+    '''Return lower-case alpha-numeric random string, a la pwgen.
+
+    :param length: number of characters to generate
+    :returns: lower-case alpha-numeric random string
+    '''
+    _str = ''
+    for _ in range(length):
+        _str += random.choice(string.lowercase + string.digits)
+    return _str
+
+
+def read_yaml(the_file):
+    '''Returns yaml data from provided file name
+
+    :param the_file: yaml file name to read
+    :returns: dictionary of yaml data from file
+    '''
+    if not os.path.exists(the_file):
+        raise ValueError('File not found: {}'.format(the_file))
+    with open(the_file) as yaml_file:
+        data = yaml.safe_load(yaml_file.read())
+    return data
+
+
+def write_yaml(data, the_file):
+    '''Save yaml data dictionary to a yaml file
+
+    :param the_file: yaml file name to write
+    :returns: dictionary of yaml data to write to file
+    '''
+    with open(the_file, 'w') as yaml_file:
+        yaml_file.write(yaml.dump(data, default_flow_style=False))
+
+
+def safe_mkdir(directory):
+    '''Make directory if it doesn't exist.  a la mkdir -p
+    '''
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+
+
+def render(source, target, context, templates_dir=None):
+    '''Render a template.
+
+       The `source` path, if not absolute, is relative to the `templates_dir`.
+
+       The `target` path should be absolute.
+
+       The context should be a dict containing the values to be replaced in
+       the template.
+
+       If omitted, `templates_dir` defaults to the current working dir.
+    '''
+
+    if templates_dir is None:
+        templates_dir = os.getcwd()
+    loader = Environment(loader=FileSystemLoader(templates_dir))
+    try:
+        source = source
+        template = loader.get_template(source)
+    except Exception:
+        logging.error('Could not load template {} from {}.'.format(
+            source, templates_dir))
+
+    safe_mkdir(templates_dir)
+    safe_mkdir(os.path.dirname(target))
+    with open(target, 'w') as _file:
+        _file.write(template.render(context))
+
+
+def get_juju_application_status(application):
+    '''Return juju application yaml status as dict.'''
+    return yaml.load(subprocess.check_output(
+                     ['juju', 'status', application,
+                      '--format', 'yaml']))
+
+
+def copy_file_to_juju_unit(local_file, remote_file, juju_unit, owner="jenkins",
+                           group="jenkins", perms="640"):
+    '''Copy a local file to a juju unit and set its ownership and permissions.
+    '''
+
+    logging.info('Copying {} to {}:{}'.format(
+        local_file, juju_unit, remote_file))
+
+    subprocess.check_output(
+        ['juju', 'scp', local_file, '{}:{}'.format(juju_unit, remote_file)])
+
+    subprocess.check_output(
+        ['juju', 'ssh', juju_unit,
+         'chown', '{}:{}'.format(owner, group), remote_file])
+
+    subprocess.check_output(
+        ['juju', 'ssh', juju_unit,
+         'chmod', perms, remote_file])
+
+
+def copy_file_on_juju_unit(src_file, dest_file, juju_unit, owner="jenkins",
+                           group="jenkins", perms="640"):
+    '''Copy a remote file from one location to another location on a juju unit
+       and set its ownership and permissions.
+    '''
+
+    logging.info('Copying {} to {} on {}'.format(
+        src_file, dest_file, juju_unit))
+
+    subprocess.check_output(
+        ['juju', 'ssh', juju_unit, 'sudo',
+         'cp', '-fvp', src_file, dest_file])
+
+    subprocess.check_output(
+        ['juju', 'ssh', juju_unit, 'sudo',
+         'chown', '{}:{}'.format(owner, group), dest_file])
+
+    subprocess.check_output(
+        ['juju', 'ssh', juju_unit, 'sudo',
+         'chmod', perms, dest_file])
+
+
+# Old dup, deprecate?
+def XXX_get_num_units(yaml_data, outer, service):
+    '''Return num_units from service in yaml data from juju bundle file
+
+    :param yaml_data: yaml data from juju bundle file, as dict
+    :param outer: first, outer key in juju bundle yaml dict data
+    :param service: juju service to query for num units
+    :returns: value of num_units from juju bundle yaml dict data
+    '''
+    logging.debug('yaml data: {}'.format(yaml_data))
+    logging.debug('outer: {}'.format(outer))
+    logging.debug('service: {}'.format(service))
+    return yaml_data[outer]['services'][service]['num_units']
+
+
+def recursive_dict_key_search(data, key):
+    '''Recursively look for key match in dictionaries, return value.
+
+    :param data: dictionary data
+    :param key: key to find
+    :returns: value of found key
+    '''
+    if key in data:
+        return data[key]
+    for _, val in data.items():
+        if isinstance(val, dict):
+            ret = recursive_dict_key_search(val, key)
+            if ret is not None:
+                return ret
+
+
+def validate_config(data, expected):
+    '''Very light check for existence of non-empty data
+
+    :param data: dictionary of k:v pairs
+    :param expected: list of items to be validated as key in data
+    :returns: None if found as expected, key if not found or key
+        value is None
+    '''
+    for k in expected:
+        val = recursive_dict_key_search(data, k)
+        if val != '' and val != 'null' and val is not None:
+            logging.debug('found {}: {}'.format(k, val))
+        else:
+            return k
+
+
+def generate_list_of_cidrs(network, octet, quantity, bits):
+    '''Create a list of IPV4 networks in CIDR notation, generated by
+    incrementing a specified octet, the specified number of times.
+
+    :param network: network string (eg, 192.168.7.0 or 10.200.0.0, non-CIDR)
+    :param octet: octet to increment (eg, 1.2.3.4)
+    :param quantity: qty of networks to generate
+    :param bits: bits to fill, ie. the slash from CIDR notation
+    :returns: list of network string items in CIDR format
+    '''
+    nets = []
+    logging.debug('operating on: {}'.format(network.split('.')))
+    this_addr = ''
+    for i in range(0, quantity):
+        octs = network.split('.')
+        oct_new = int(octs[octet - 1]) + i
+        if oct_new > 254:
+            raise ValueError('IPv4 octec decimal cannot exceed 254! {} was '
+                             'attempted.'.format(oct_new))
+        octs[octet - 1] = str(oct_new)
+        this_addr = '.'.join(octs)
+        nets.append('{}/{}'.format(this_addr, bits))
+    logging.debug('networks to build ({}): {}'.format(len(nets), nets))
+    return nets
+
+
+def predict_juju_unit_names(conf_mod, jsv_qty, jtk_qty, jlb_qty):
+    '''Create a list of juju jenkins master and slave service
+       units, predictively.
+    '''
+    units = []
+    units.append(JM_NAME_TEMPL.format('0'))
+
+    for _templ_qty_map in [(SLAVE_NAME_TEMPLATES['slave'], jsv_qty),
+                           (SLAVE_NAME_TEMPLATES['task'], jtk_qty),
+                           (SLAVE_NAME_TEMPLATES['lab'], jlb_qty)]:
+        _templ = _templ_qty_map[0]
+        _qty = _templ_qty_map[1]
+        for unit in range(0, _qty):
+            units.append(_templ.format(unit))
+
+    return units
+
+
+def predict_model_names(conf_mod, jsv_qty, jtk_qty, jlb_qty):
+    '''Return a list of juju model names to create'''
+    models = []
+    models.append("{}-{}{}".format(conf_mod['model-name-base'],
+                                   conf_mod['master-abbrv'],
+                                   0))
+
+    for _abbrv_qty_map in [(conf_mod['slave-abbrv'], jsv_qty),
+                           (conf_mod['task-abbrv'], jtk_qty),
+                           (conf_mod['lab-abbrv'], jlb_qty)]:
+        _abbrv = _abbrv_qty_map[0]
+        _qty = _abbrv_qty_map[1]
+        for unit in range(0, _qty):
+            models.append("{}-{}{}".format(conf_mod['model-name-base'],
+                                           _abbrv,
+                                           str(unit).zfill(2)))
+    return models
+
+
+# Unused, deprecate?:
+def XXX_floating_ip_is_available(neutron):
+    '''Check if a floating ip is available to the tenant, using the
+    provided neutron client object.
+
+    :param neutron: neutron client object
+    :returns: True if a floating IP is available to the tenant
+    '''
+    ips = neutron.list_floatingips(status='DOWN')['floatingips']
+
+    if len(ips) > 0:
+        logging.debug('floating ips available to tenant: {}'.format(ips))
+        return True
+    else:
+        return False
+
+
+# Unused, deprecate?:
+def XXX_has_floating_ip(addresses, fip_str):
+    '''Inspect list of addresses for an item which starts with the specified
+    string.  Returns the (first) matching item found, returns None if not.
+
+    :param addresses: list of dicts containing nova addresses data
+    :param fip_str: floating IP string to match, generally first 2 or 3 octets
+    '''
+    for addr in addresses:
+        if addr['addr'].startswith(fip_str):
+            return addr['addr']
+    return None
+
+
+# Unused, deprecate?:
+def XXX_f_contains_str(the_file, str_find):
+    '''Search a file for a string
+
+    :param the_file: file name to read
+    :param str_find: string to find in the file
+    :returns: True if string is found in file
+    '''
+    _pos = open(the_file, 'r').read().find(str_find)
+    if _pos >= 0:
+        return True
+    else:
+        return False
+
+
+# Unused, deprecate?:
+def XXX_replace_line_with_lines(file_name, str_find, with_lines):
+    '''Inject lines into file, where string is found in exactly and
+       only one line.  Return None if successful, return a message otherwise.
+
+    :param file_name: file name as string, to read and write
+    :param str_find: string to find in a line
+    :param str_lines: list of lines to inject
+    '''
+    with open(file_name, 'r') as r_file:
+        lines = r_file.readlines()
+
+    indices = []
+    for idx, line in enumerate(lines):
+        if str_find in line:
+            indices.append(idx)
+    if len(indices) > 1:
+        return 'Could not replace line, found more than one match.'
+    elif len(indices) == 0:
+        return 'Could not replace line, no match in {}'.format(file_name)
+    elif len(indices) == 1:
+        logging.info('string find for {}: {}'.format(str_find, indices))
+        with open(file_name, 'w') as w_file:
+            out_lines = (lines[0:indices[0]] +
+                         with_lines +
+                         lines[indices[0] + 1:])
+            w_file.writelines(out_lines)
+
+
+def dict_to_yaml(dict_data):
+    return yaml.dump(dict_data, default_flow_style=False)
+
+
+def get_keystone_v3_session():
+    '''Get a keystone v3 session based on env vars.'''
+
+    auth = keystoneauth1.Password(
+        username=os.environ['OS_USERNAME'],
+        user_domain_name=os.environ['OS_USER_DOMAIN_NAME'],
+        password=os.environ['OS_PASSWORD'],
+        project_name=os.environ['OS_PROJECT_NAME'],
+        project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'],
+        auth_url=os.environ['OS_AUTH_URL']
+    )
+
+    return keystoneauth1_session.Session(auth=auth)
+
+
+def get_neutron_client(session):
+    '''Get a neutron client connection based on ksv3 session and env vars.'''
+    return ne_client.Client(session=session,
+                            region_name=os.environ['OS_REGION_NAME'])

=== added file 'deploy/osci-controller-setup.sh'
--- deploy/osci-controller-setup.sh	1970-01-01 00:00:00 +0000
+++ deploy/osci-controller-setup.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash -uex
+: ${CTI_REPO:="https://github.com/openstack-charmers/charm-test-infra"}  # WIP
+: ${CTI_REPO_BRANCH:="master"}
+: ${CTI_CODIR:="${HOME}/tools/charm-test-infra"}
+
+## Gather tools
+rm -rf $CTI_CODIR
+git clone --depth 1 $CTI_REPO    $CTI_CODIR    -b $CTI_REPO_BRANCH
+
+## Bootstrap controller and add model for OSCI on ServerStack
+cd $CTI_CODIR
+. examples/env-larger-controller
+time ./juju-openstack-controller-example.sh
+
+juju switch osci-serverstack:osci
+juju status --color
+juju controllers
+juju models
+

=== added file 'deploy/osci-float-all-instances.sh'
--- deploy/osci-float-all-instances.sh	1970-01-01 00:00:00 +0000
+++ deploy/osci-float-all-instances.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash -uex
+# Give all instances a floating IP address.  Requires >= Newton openstack client
+
+fip_count=$(openstack floating ip list | awk '/None/ { print $4 }' | wc -l)
+instances=$(openstack server list | grep ACTIVE | grep -v '\,' | awk '{ print $2 }')
+inst_count=$(echo $instances | wc -w)
+
+fip_diff=$(( $inst_count - $fip_count ))
+if [[ "$fip_diff" != "0" ]]; then
+    for m in $(seq 1 $fip_diff); do
+        openstack floating ip create ext_net
+    done
+fi
+
+for instance in $instances; do
+    ip_f="$(openstack floating ip list | awk '/None/ { print $4 }' | head -n 1)"
+    openstack server add floating ip $instance $ip_f
+done

=== added file 'deploy/osci-model-deploy.sh'
--- deploy/osci-model-deploy.sh	1970-01-01 00:00:00 +0000
+++ deploy/osci-model-deploy.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,68 @@
+#!/bin/bash -uex
+# Deploy Jenkins Master and Slave Charm Applications for OpenStack Charm CI
+
+DEPLOY_SCRATCH_DIR="$HOME/deploy2"
+#JM_CHARM="cs:xenial/jenkins-4"
+#JM_CHARM="cs:xenial/jenkins-2"   # Upstream before storage support
+#JM_CHARM="cs:~1chb1n/jenkins"    # WIP based on upstream
+#JS_CHARM="cs:~free.ekanayaka/xenial/jenkins-slave-2"    # Already has jenkins-slave deb packed in files dir
+JM_CHARM="lp:~1chb1n/+junk/jenkins-reactive-temp-build"
+JS_CHARM="lp:~1chb1n/+junk/jenkins-slave-legacy-mash"
+JM_PKG_URL="https://pkg.jenkins.io/debian-stable/binary/jenkins_2.7.4_all.deb"
+JM_PKG_FILENAME="$(echo "${JM_PKG_URL##*/}")"
+SERIES="xenial"
+
+# Fetch and "Fat-pack" the charms
+mkdir -vp $DEPLOY_SCRATCH_DIR
+stat $DEPLOY_SCRATCH_DIR/charm-jenkins ||\
+    bzr branch $JM_CHARM $DEPLOY_SCRATCH_DIR/charm-jenkins
+    #charm pull $JM_CHARM $DEPLOY_SCRATCH_DIR/charm-jenkins
+
+stat $DEPLOY_SCRATCH_DIR/charm-jenkins-slave ||\
+    bzr branch $JS_CHARM $DEPLOY_SCRATCH_DIR/charm-jenkins-slave
+    #charm pull $JS_CHARM $DEPLOY_SCRATCH_DIR/charm-jenkins-slave
+
+if ! stat $DEPLOY_SCRATCH_DIR/$JM_PKG_FILENAME; then
+    . ~/proxy_set.sh
+    env | egrep "prox|PROX"
+    wget -v $JM_PKG_URL -P $DEPLOY_SCRATCH_DIR --show-progress
+    . ~/proxy_unset.sh
+fi
+
+rm -fv $DEPLOY_SCRATCH_DIR/charm-jenkins/files/*jenkins*deb ||:
+mkdir -vp $DEPLOY_SCRATCH_DIR/charm-jenkins/files/
+cp -fv $DEPLOY_SCRATCH_DIR/$JM_PKG_FILENAME $DEPLOY_SCRATCH_DIR/charm-jenkins/files/
+(cd $DEPLOY_SCRATCH_DIR/charm-jenkins/files/
+    ln -s $JM_PKG_FILENAME jenkins.deb)
+
+juju switch osci-serverstack:osci
+
+juju status osci-master | grep "^osci-master " ||
+    juju deploy  $DEPLOY_SCRATCH_DIR/charm-jenkins        osci-master  -n 1  --constraints="mem=7G  cores=4 root-disk=100G"  --config config/juju-apps/osci-master.yaml  --series $SERIES
+
+juju status osci-task | grep "^osci-task" ||
+    juju deploy  $DEPLOY_SCRATCH_DIR/charm-jenkins-slave  osci-task   -n 2   --constraints="mem=12G cores=8 root-disk=80G"   --config config/juju-apps/osci-task.yaml    --series $SERIES
+
+juju status osci-slave | grep "^osci-slave " ||
+    juju deploy  $DEPLOY_SCRATCH_DIR/charm-jenkins-slave  osci-slave  -n 12  --constraints="mem=3G  cores=4 root-disk=40G"   --config config/juju-apps/osci-slave.yaml   --series $SERIES
+
+juju status osci-lab | grep "^osci-lab " ||
+    juju deploy  $DEPLOY_SCRATCH_DIR/charm-jenkins-slave  osci-lab    -n 4   --constraints="mem=3G  cores=4 root-disk=40G"   --config config/juju-apps/osci-lab.yaml     --series $SERIES
+
+# Temp hack. Should juju-wait instead. And the charms shouldn't not-work if relating too soon!
+#sleep 600
+
+juju add-relation   osci-master:master   osci-task:slave ||:
+juju add-relation   osci-master:master   osci-slave:slave ||:
+juju add-relation   osci-master:master   osci-lab:slave ||:
+
+UNIT_IMPORT_IDS="1chb1n james-page thedac admcleod"
+juju switch controller
+juju run --all "sudo su - ubuntu -c \"ssh-import-id $UNIT_IMPORT_IDS\""
+juju switch osci
+juju run --all "sudo su - ubuntu -c \"ssh-import-id $UNIT_IMPORT_IDS\""
+juju run --all "sudo su - jenkins -c \"ssh-import-id $UNIT_IMPORT_IDS\""
+
+# /!\ The upstream charm relies on failed hook re-execution.  It will
+# be necessary to retry the master after it fails once, like so:
+#juju resolved osci-master/0

=== renamed file 'deploy-uosci.py' => 'deploy/osci-nets-and-models.py'
--- deploy-uosci.py	2016-08-29 16:01:52 +0000
+++ deploy/osci-nets-and-models.py	2017-05-27 00:22:36 +0000
@@ -1,29 +1,23 @@
-#!/usr/bin/python
-'''
-  Deploys/creates (or updates) jenkins environment, neutron networks, etc.
-  See README(s)!  This is not incorporated into jenkins jobs/tests.
-'''
+#!/usr/bin/env python
+'''
+Creates networks, subnets and prepares info for later consumption by
+osci jenkins slaves regarding juju models.
+'''
+
 import logging
-import os
-import subprocess
-import uuid
 import yaml
-from copy import deepcopy
 from netaddr import IPNetwork
-from neutronclient.neutron import client as ne_client
-from novaclient import client as nv_client
-from time import time
-from common.osci_utils import (
-    f_contains_str,
-    floating_ip_is_available,
-    get_networks,
-    get_num_units,
-    get_os_creds,
-    has_floating_ip,
+from lib.osci_deploy_helpers import (
+    copy_file_to_juju_unit,
+    copy_file_on_juju_unit,
+    generate_list_of_cidrs,
+    get_juju_application_status,
+    get_neutron_client,
+    get_keystone_v3_session,
+    predict_juju_unit_names,
+    predict_model_names,
     read_yaml,
-    recursive_dict_key_search,
-    replace_line_with_lines,
-    rnd_str,
+    render,
     safe_mkdir,
     validate_config,
     write_yaml
@@ -33,13 +27,7 @@
 logging.basicConfig(level=logging.DEBUG)
 
 EV = 'environments'
-DEPLOY_CONFIG_FILE = 'deployment/deploy-config.yaml'
-JM_NAME_TEMPL = 'osci/{}'
-SLAVE_NAME_TEMPLATES = {
-    'slave': 'osci-slave/{}',  # jsv
-    'lab': 'osci-lab/{}',      # jlb
-    'task': 'osci-task/{}'     # jtk
-}
+DEPLOY_CONFIG_FILE = 'config/nets-and-models.yaml'
 
 
 def validate_network_config(conf):
@@ -76,59 +64,19 @@
     return ret
 
 
-def get_junits(conf_env, jsv_qty, jtk_qty, jlb_qty):
-    '''Create a list of juju jenkins master and slave service
-       units, predictively.
-    '''
-    units = []
-    units.append(JM_NAME_TEMPL.format('0'))
-
-    for _templ_qty_map in [(SLAVE_NAME_TEMPLATES['slave'], jsv_qty),
-                           (SLAVE_NAME_TEMPLATES['task'], jtk_qty),
-                           (SLAVE_NAME_TEMPLATES['lab'], jlb_qty)]:
-        _templ = _templ_qty_map[0]
-        _qty = _templ_qty_map[1]
-        for unit in range(0, _qty):
-            units.append(_templ.format(unit))
-
-    return units
-
-
-def get_enviros(conf_env, jsv_qty, jtk_qty, jlb_qty):
-    '''Return a list of juju model names to create'''
-    envs = []
-    envs.append("{}-{}{}".format(conf_env['env-name-base'],
-                                 conf_env['master-abbrv'],
-                                 0))
-
-    for _abbrv_qty_map in [(conf_env['slave-abbrv'], jsv_qty),
-                           (conf_env['task-abbrv'], jtk_qty),
-                           (conf_env['lab-abbrv'], jlb_qty)]:
-        _abbrv = _abbrv_qty_map[0]
-        _qty = _abbrv_qty_map[1]
-        for unit in range(0, _qty):
-            envs.append("{}-{}{}".format(conf_env['env-name-base'],
-                                         _abbrv,
-                                         str(unit).zfill(2)))
-    return envs
-
-
-def build_nets_and_subs(d_env_data, creds, conf):
+def build_nets_and_subs(neutron_c, d_models_data, conf):
     '''Build new neutron subnets and networks from dict data, and connect
        to neutron router.'''
-    # Build new neutron networks, subnets, and connect them to the router
-    neutron = ne_client.Client('2.0', **creds[0])
-
     conf_net = conf['osci']['network']
-    conf_env = conf['osci']['enviro']
+    conf_mod = conf['osci']['model']
 
-    base_name = conf_env['env-name-base']
+    base_name = conf_mod['model-name-base']
     var_oct = conf_net['var-octet']
     router_name = conf_net['neutron-router']
     dns = conf_net['neutron-dns']
 
-    for k, conf in d_env_data['enviros'].iteritems():
-        net_str = conf['network']
+    for k, v in d_models_data['models'].items():
+        net_str = v['network']
         sub_name = "{}_{}_{}".format(base_name,
                                      net_str.split('.')[int(var_oct) - 1],
                                      'sub')
@@ -137,7 +85,7 @@
                                      'net')
 
         # Create neutron network
-        networks = neutron.list_networks(name=net_name)
+        networks = neutron_c.list_networks(name=net_name)
         if len(networks['networks']) == 0:
             logging.info('Creating network: %s',
                          net_name)
@@ -147,13 +95,13 @@
                     'shared': False
                 }
             }
-            neu_network = neutron.create_network(network_msg)['network']
+            neutron_net = neutron_c.create_network(network_msg)['network']
         else:
             logging.info('Network %s already exists.', net_name)
-            neu_network = networks['networks'][0]
+            neutron_net = networks['networks'][0]
 
-        # Check if subnet name and IP space is free here
-        subnets = neutron.list_subnets(name=sub_name)
+        # Check if subnet name and IP space is free
+        subnets = neutron_c.list_subnets(name=sub_name)
         if len(subnets['subnets']) == 0:
             logging.info('Creating subnet: %s', sub_name)
             this_cidr = IPNetwork(net_str)
@@ -163,7 +111,7 @@
             subnet_msg = {
                 'subnet': {
                     'name': sub_name,
-                    'network_id': neu_network['id'],
+                    'network_id': neutron_net['id'],
                     'enable_dhcp': True,
                     'cidr': str(this_cidr),
                     'ip_version': 4,
@@ -175,456 +123,92 @@
                 'end': str(alloc_end)
             }]
             logging.info(subnet_msg)
-            neu_subnet = neutron.create_subnet(subnet_msg)['subnet']
+            neutron_sub = neutron_c.create_subnet(subnet_msg)['subnet']
         else:
             logging.info('Subnet %s already exists.', net_name)
-            neu_subnet = subnets['subnets'][0]
+            neutron_sub = subnets['subnets'][0]
 
         # Wire the network to the router
-        routers = neutron.list_routers(name=router_name)
+        routers = neutron_c.list_routers(name=router_name)
         if len(routers['routers']) == 0:
             raise ValueError('Unable to locate router')
         else:
-            ports = neutron.list_ports(device_owner='network:router_interface',
-                                       network_id=neu_network['id'])
+            ports = neutron_c.list_ports(
+                device_owner='network:router_interface',
+                network_id=neutron_net['id']
+            )
             if len(ports['ports']) == 0:
                 logging.info('Adding interface from %s to %s',
                              router_name, sub_name)
-                neu_router = routers['routers'][0]
-                neutron.add_interface_router(neu_router['id'],
-                                             {'subnet_id': neu_subnet['id']})
+                neutron_rtr = routers['routers'][0]
+                neutron_c.add_interface_router(
+                    neutron_rtr['id'],
+                    {'subnet_id': neutron_sub['id']}
+                )
             else:
                 logging.info('Router already connected to subnet %s', sub_name)
 
-        d_env_data['enviros'][k]['network-id'] = str(neu_network['id'])
-
-
-def is_deployed(jma_num_units, jsv_num_units, jtk_num_units, jlb_num_units):
-    '''Check juju status against expected number of jenkins
-       master and slave units
-    '''
-    ret = True
-    try:
-        # Deployed, check unit quantities
-        jm_stat = yaml.load(subprocess.check_output(
-                            ['juju', 'status', 'osci']))
-        jsv_stat = yaml.load(subprocess.check_output(
-                            ['juju', 'status', 'osci-slave']))
-        jtk_stat = yaml.load(subprocess.check_output(
-                            ['juju', 'status', 'osci-task']))
-        jlb_stat = yaml.load(subprocess.check_output(
-                            ['juju', 'status', 'osci-lab']))
-
-        jma_count = len(jm_stat['services']['osci']['units'])
-        jsv_count = len(jsv_stat['services']['osci-slave']['units'])
-        jtk_count = len(jtk_stat['services']['osci-task']['units'])
-        jlb_count = len(jlb_stat['services']['osci-lab']['units'])
-
-        if int(jma_count) != jma_num_units:
-            ret = ('Juju model is up, but jenkins master'
-                   'count is unexpected: {}/{}'.format(jma_count,
-                                                       jma_num_units))
-        if int(jsv_count) != jsv_num_units:
-            ret = ('Juju model is up, but jenkins slave count is '
-                   'unexpected: {}/{}'.format(jsv_count, jsv_num_units))
-        if int(jtk_count) != jtk_num_units:
-            ret = ('Juju model is up, but task slave count is '
-                   'unexpected: {}/{}'.format(jtk_count, jtk_num_units))
-        if int(jlb_count) != jlb_num_units:
-            ret = ('Juju model is up, but lab slave count is '
-                   'unexpected: {}/{}'.format(jlb_count, jlb_num_units))
-    except (subprocess.CalledProcessError, KeyError):
-        # Not deployed
-        ret = False
-    return ret
-
-
-def make_post_file_xfer_script(data, script_file_abs):
-    '''Create post-deployment file transfer script, which utilizes
-       juju scp and juju ssh to copy files into the jenkins units,
-       such as novarc and environments.yaml, and to set the permissions.
-    '''
-    cmds = []
-    for d_file in data:
-        # Separator
-        cmds.append('echo -e "\\n----{}: {}----"'.format(d_file['unit'],
-                                                         d_file['src-name']))
-
-        # Copy some files to the unit
-        juju_scp_cmd = 'juju scp {}/{} {}:{}/{}'.format(d_file['src-dir'],
-                                                        d_file['src-name'],
-                                                        d_file['unit'],
-                                                        d_file['tmp-dir'],
-                                                        d_file['dst-name'])
-        cmds.append(juju_scp_cmd)
-
-        # Modify files inside the unit
-        cmd_bash = ''
-        cmd_bash += "sudo su - jenkins -c 'mkdir -p {}' && ".format(
-                    d_file['dst-dir'])
-        cmd_bash += "sudo mv {}/{} {}/{} && ".format(d_file['tmp-dir'],
-                                                     d_file['dst-name'],
-                                                     d_file['dst-dir'],
-                                                     d_file['dst-name'])
-        cmd_bash += "sudo chown -R {} {} && ".format(
-                    d_file['chown'],
-                    d_file['dst-dir'])
-        cmd_bash += "sudo chmod {} {}/{}".format(d_file['chmod'],
-                                                 d_file['dst-dir'],
-                                                 d_file['dst-name'])
-        juju_ssh_cmd = 'juju ssh {} "{}"'.format(d_file['unit'], cmd_bash)
-        cmds.append(juju_ssh_cmd)
-
-    # Write file
-    with open(script_file_abs, 'w') as out_file:
-        out_file.write('{}\n'.format('#!/bin/bash -e'))
-        for cmd in cmds:
-            out_file.write('{}\n'.format(cmd))
-
-    subprocess.check_call(['chmod',
-                           '770', script_file_abs])
-
-    return script_file_abs
-
-
-def create_env_yamls_and_post_xfer_dict(data, conf, creds):
-    '''Create juju environment yaml files for each master and slave,
-       create and return absolute path of bash script which pushes
-       files into the juju service units.
-    '''
-    f_template = read_yaml(conf['env-template'])
-    f_reference = read_yaml(conf['env-reference'])
-#    series = read_yaml('deployment/deploy-files/environment-series.yaml')
-    apt_proxy = recursive_dict_key_search(f_reference, 'apt-http-proxy')
-    jenk_home = '/var/lib/jenkins'
-    u_home = '/home/ubuntu'
-    _files = []
-
-    for env_name, env_attr in data['enviros'].iteritems():
-        d_tmp = deepcopy(f_template)
-        env_name_dev = '{}-jdev'.format(env_name)
-        env_name_prop = '{}-jprop'.format(env_name)
-
-        # Set this slave's juju model name
-        d_tmp[EV][env_name] = deepcopy(d_tmp[EV]['__ENVIRO__'])
-        d_tmp['default'] = env_name
-        del d_tmp[EV]['__ENVIRO__']
-
-        # Set juju model openstack parameters
-        d_tmp[EV][env_name]['admin-secret'] = rnd_str(length=32)
-        d_tmp[EV][env_name]['auth-url'] = creds[0]['auth_url']
-        d_tmp[EV][env_name]['control-bucket'] = str(uuid.uuid1())
-        d_tmp[EV][env_name]['password'] = creds[0]['password']
-        d_tmp[EV][env_name]['tenant-name'] = creds[0]['tenant_name']
-        d_tmp[EV][env_name]['username'] = creds[0]['username']
-
-        if 'network-id' in env_attr:
-            d_tmp[EV][env_name]['network'] = env_attr['network-id']
-
-        if apt_proxy is not None:
-            d_tmp[EV][env_name]['apt-http-proxy'] = apt_proxy
-        else:
-            del d_tmp[EV][env_name]['apt-http-proxy']
-
-        # Create juju-devel model yaml for environments.yaml
-        d_tmp[EV][env_name_dev] = deepcopy(d_tmp[EV][env_name])
-        d_tmp[EV][env_name_dev]['agent-stream'] = 'devel'
-
-        # Create juju-proposed model yaml for environments.yaml
-        d_tmp[EV][env_name_prop] = deepcopy(d_tmp[EV][env_name])
-        d_tmp[EV][env_name_prop]['agent-stream'] = 'proposed'
-
-        # Create juju model yaml for environments.yaml
-        safe_mkdir(conf['out-dir'])
-        env_filename = 'environments-{}.yaml'.format(env_name)
-        env_file_abs = '{}/{}'.format(conf['out-dir'], env_filename)
-        write_yaml(d_tmp, env_file_abs)
-        logging.debug('created environment file: {}'.format(env_file_abs))
-
-        # Add to post-deployment file xfer dict
-        _files.append(
-            {'src-name': env_filename,
-             'dst-name': 'environments.yaml',
-             'src-dir': conf['out-dir'],
-             'tmp-dir': u_home,
-             'dst-dir': '{}/.juju'.format(jenk_home),
-             'chown': 'jenkins:jenkins',
-             'chmod': '600',
-             'unit': env_attr['unit']
-             })
-        _files.append(
-            {'src-name': 'novarc',
-             'dst-name': 'novarc',
-             'src-dir': os.getenv("HOME"),
-             'tmp-dir': u_home,
-             'dst-dir': jenk_home,
-             'chown': 'jenkins:jenkins',
-             'chmod': '600',
-             'unit': env_attr['unit']
-             })
-
-    # also set master's cli.conf
-    _files.append(
-        {'src-name': 'cli.conf',
-         'dst-name': 'cli.conf',
-         'src-dir': 'deployment/deploy-files',
-         'tmp-dir': u_home,
-         'dst-dir': '{}/.jenkins'.format(jenk_home),
-         'chown': 'jenkins:jenkins',
-         'chmod': '600',
-         'unit': 'osci/0'
-         })
-
-    return _files
-
-
-def parse_jenkins_config_xml(conf):
-    '''Pull config.xml from from the jenkins master, replace or
-       inject lines of config, return list of dict of files/attributes
-       for handling by the post-xfer routine.
-    '''
-
-    # Get config.xml from jenkins master
-    time_stamp = str(time()).replace('.', '-')
-    file_name = 'config.xml.{}'.format(time_stamp)
-
-    subprocess.check_call(['juju', 'ssh', 'osci/0',
-                           'sudo cp /var/lib/jenkins/config.xml '
-                           '/home/ubuntu/{}'.format(file_name)])
-    subprocess.check_call(['juju', 'ssh', 'osci/0',
-                           'sudo chown ubuntu:ubuntu '
-                           '/home/ubuntu/{}'.format(file_name)])
-    juju_scp_cmd = ('juju scp {}:{} {}'.format('osci/0',
-                    '/home/ubuntu/{}'.format(file_name),
-                    conf['out-dir']))
-    subprocess.check_call(juju_scp_cmd.split())
-
-    loc_xml = '{}/{}'.format(conf['out-dir'], file_name)
-    do_copy = False
-    _files = []
-
-    operations = []
-    operations.extend(
-        [{'replace': 'FullControlOnceLoggedInAuthorizationStrategy',
-          'with': 'deployment/deploy-files/config.xml.authstrat'
-          },
-         {'replace': '<globalNodeProperties/>',
-          'with': 'deployment/deploy-files/config.xml.global'
-          }])
-
-    if not f_contains_str(the_file=loc_xml, str_find='<listView>'):
-        operations.append(
-            {'replace': '</views>',
-             'with': 'deployment/deploy-files/config.xml.views'
-             })
-
-    for _op in operations:
-        logging.info('op: {}:{}:{}'.format(loc_xml,
-                                           _op['replace'],
-                                           _op['with']))
-
-        with open(_op['with']) as inject_file:
-            inject_lines = inject_file.readlines()
-            ret = replace_line_with_lines(file_name=loc_xml,
-                                          str_find=_op['replace'],
-                                          with_lines=inject_lines)
-            if ret:
-                # No need, not modified.
-                logging.info(ret)
-            else:
-                do_copy = True
-
-    if do_copy:
-        # Add config.xml to the list to copy back to jenkins master
-        logging.info('do_copy True')
-        _files.append(
-            {'src-name': file_name,
-             'dst-name': 'config.xml',
-             'src-dir': conf['out-dir'],
-             'tmp-dir': '/home/ubuntu',
-             'dst-dir': '/var/lib/jenkins',
-             'chown': 'jenkins:jenkins',
-             'chmod': '644',
-             'unit': 'osci/0'
-             })
-    return _files
-
-
-def jenkins_other_xml():
-    '''Build files list for additional jenkins xml files
-       to push into the master
-    '''
-    _files = []
-    _files.append(
-        {'src-name': 'hudson.tasks.Mailer.xml',
-         'dst-name': 'hudson.tasks.Mailer.xml',
-         'src-dir': 'deployment/deploy-files',
-         'tmp-dir': '/home/ubuntu',
-         'dst-dir': '/var/lib/jenkins',
-         'chown': 'jenkins:jenkins',
-         'chmod': '644',
-         'unit': 'osci/0'
-         })
-    _files.append(
-        {'src-name': 'hudson.plugins.build_publisher.BuildPublisher.xml',
-         'dst-name': 'hudson.plugins.build_publisher.BuildPublisher.xml',
-         'src-dir': 'deployment/deploy-files',
-         'tmp-dir': '/home/ubuntu',
-         'dst-dir': '/var/lib/jenkins',
-         'chown': 'jenkins:jenkins',
-         'chmod': '644',
-         'unit': 'osci/0'
-         })
-    return _files
-
-
-def float_jenkins_master(creds, conf):
-    '''Associate a floating IP with the jenkins master instance (create
-       floating IP if necessary).
-    '''
-    conf_net = conf['osci']['network']
-
-    neutron = ne_client.Client('2.0', **creds[0])
-    nova = nv_client.Client('2', **creds[1])
-    jm_stat = yaml.load(subprocess.check_output(['juju', 'status', 'osci']))
-    jm_id = jm_stat['machines'].keys()[0]
-    jm_instance_id = jm_stat['machines'][jm_id]['instance-id']
-    jm_instance = nova.servers.get(server=jm_instance_id)
-    jm_addresses = jm_instance.addresses[conf_net['default-network']]
-    ext_net_id = (neutron.list_networks(name=conf_net['ext-net'])
-                  ['networks'][0]['id'])
-
-    ret = has_floating_ip(jm_addresses, conf_net['fip-str'])
-    if ret:
-        logging.info('Instance already has a floating ip: {}'.format(ret))
-    else:
-        if floating_ip_is_available(neutron):
-            logging.info('Floating ip exists in tenant, associating it.')
-            jm_float_ip = (neutron.list_floatingips(status='DOWN')
-                           ['floatingips'][0]['floating_ip_address'])
-        else:
-            logging.info('No free floating ip(s) in tenant, creating one.')
-            fip_msg = {
-                'floatingip': {
-                    'floating_network_id': ext_net_id
-                }
-            }
-            try:
-                jm_float_ip = (neutron.create_floatingip(fip_msg)['floatingip']
-                               ['floating_ip_address'])
-
-            except Exception:
-                raise ValueError('Tenant could not create a floating IP')
-
-        # Associate floating ip with instance
-        try:
-            jm_instance.add_floating_ip(address=jm_float_ip)
-        except Exception:
-            raise ValueError('Failed to associate floating ip '
-                             '({}) to instance {}.'.format(jm_float_ip,
-                                                           jm_instance_id))
-
-        # Confirm
-        jm_instance = nova.servers.get(server=jm_instance_id)
-        jm_addresses = jm_instance.addresses[conf_net['default-network']]
-        ret = has_floating_ip(jm_addresses, conf_net['fip-str'])
-        if ret:
-            logging.info('Instance has floating ip: {}'.format(ret))
-
-
-def main():
-    '''Read and validate configs, build networks, deploy bundle,
-       perform some post-deploy config and file transfers.
-    '''
-    # Read config from yaml
+        d_models_data['models'][k]['network-id'] = str(neutron_net['id'])
+
+
+def get_num_units():
+    '''Return specific juju application unit quantities from juju model status.
+    '''
+    jm_stat = get_juju_application_status('osci-master')
+    jsv_stat = get_juju_application_status('osci-slave')
+    jtk_stat = get_juju_application_status('osci-task')
+    jlb_stat = get_juju_application_status('osci-lab')
+
+    return (len(jm_stat['applications']['osci-master']['units']),
+            len(jsv_stat['applications']['osci-slave']['units']),
+            len(jtk_stat['applications']['osci-task']['units']),
+            len(jlb_stat['applications']['osci-lab']['units']))
+
+
+def generate_models_data(conf):
+    '''Read and validate configs, build networks, dump models:networks yaml.
+    '''
     conf = read_yaml(DEPLOY_CONFIG_FILE)
-    creds = get_os_creds()
 
     # Basic non-null general parameter validation
-    expected = ['env-name-base', 'master-abbrv', 'slave-abbrv', 'split',
-                'env-template', 'out-dir', 'deployer-bundle']
+    expected = ['model-name-base', 'master-abbrv', 'slave-abbrv', 'split',
+                'out-dir']
     ret = validate_config(conf['osci'], expected)
     if ret:
         logging.debug('conf: {}'.format(conf['osci']))
         raise ValueError('Config data missing. {}'.format(ret))
 
     # Break out config parameters
+    conf_net = conf['osci']['network']
+    conf_mod = conf['osci']['model']
     net_split = conf['osci']['network']['split']
-    conf_net = conf['osci']['network']
-    conf_env = conf['osci']['enviro']
-
-    # Inspect deployer bundle yaml for needed info & validate
-    deployer_bundle = conf['osci']['deployer-bundle']
-    d_dep_bundle = read_yaml(deployer_bundle)
-    jma_num_units = get_num_units(d_dep_bundle,
-                                  d_dep_bundle.keys()[0],
-                                  'osci')
-    jsv_num_units = get_num_units(d_dep_bundle,
-                                  d_dep_bundle.keys()[0],
-                                  'osci-slave')
-    jtk_num_units = get_num_units(d_dep_bundle,
-                                  d_dep_bundle.keys()[0],
-                                  'osci-task')
-    jlb_num_units = get_num_units(d_dep_bundle,
-                                  d_dep_bundle.keys()[0],
-                                  'osci-lab')
-    logging.debug('jma: {}\njsv: {}\njtk: {}\njlb: {}'.format(
-        jma_num_units, jsv_num_units, jtk_num_units, jlb_num_units))
-
-    # Validate bundle unit counts before deploying
-    if jma_num_units != 1:
-        raise ValueError('Expected exactly 1 jenkins master, '
-                         'found: {}'.format(jma_num_units))
-    if jsv_num_units < 1:
-        raise ValueError('Expected at least 1 jenkins slave, '
-                         'found: {}'.format(jsv_num_units))
-    if jtk_num_units < 1:
-        raise ValueError('Expected at least 1 task slave, '
-                         'found: {}'.format(jtk_num_units))
-    if jlb_num_units < 1:
-        raise ValueError('Expected at least 1 lab slave, '
-                         'found: {}'.format(jlb_num_units))
-
-    # Deploy if not already deployed
-    ret = is_deployed(jma_num_units, jsv_num_units,
-                      jtk_num_units, jlb_num_units)
-    if ret is not True and ret is not False:
-        raise ValueError(ret)
-    elif ret is True:
-        logging.info('Model is already deployed, moving on.')
-    elif ret is False:
-        logging.info('Model is not deployed, deploying...')
-        subprocess.check_call(['juju-deployer',
-                               '-v', '-d', '-B',
-                               '-c', deployer_bundle])
-        # Confirm new deployment
-        ret = is_deployed(jma_num_units, jsv_num_units,
-                          jtk_num_units, jlb_num_units)
-        if ret is not True:
-            raise ValueError(ret)
-
-    # Predictively construct new juju environment and unit names lists
-    junits = get_junits(conf_env=conf_env,
-                        jsv_qty=jsv_num_units,
-                        jtk_qty=jtk_num_units,
-                        jlb_qty=jlb_num_units)
-
-    enviros = get_enviros(conf_env=conf_env,
-                          jsv_qty=jsv_num_units,
-                          jtk_qty=jtk_num_units,
-                          jlb_qty=jlb_num_units)
+
+    # Predictively construct new juju model names from unit names
+    jma_num_units, jsv_num_units, jtk_num_units, jlb_num_units = \
+        get_num_units()
+
+    junits = predict_juju_unit_names(conf_mod=conf_mod,
+                                     jsv_qty=jsv_num_units,
+                                     jtk_qty=jtk_num_units,
+                                     jlb_qty=jlb_num_units)
+
+    models = predict_model_names(conf_mod=conf_mod,
+                                 jsv_qty=jsv_num_units,
+                                 jtk_qty=jtk_num_units,
+                                 jlb_qty=jlb_num_units)
+
+    logging.info('Models: {}'.format(models))
 
     # Network separation
-    if net_split is False:
+    if not net_split:
         logging.info('No network separation.')
         nets = [None] * len(junits)
-    elif net_split is True:
+    else:
         logging.info('Using layer 2 network separation.')
 
         # Basic non-null network parameter validation
         expected = ['cidr', 'var-octet', 'neutron-router',
-                    'neutron-net', 'neutron-sub', 'neutron-dns',
-                    'ext-net', 'fip-str']
+                    'neutron-net', 'neutron-sub', 'neutron-dns']
         ret = validate_config(conf_net, expected)
         if ret:
             raise ValueError('Network config data missing. {}'.format(ret))
@@ -638,65 +222,125 @@
         ip_cidr = IPNetwork(conf_net['cidr'])
         total_units = (jma_num_units + jsv_num_units +
                        jtk_num_units + jlb_num_units)
-        nets = get_networks(network=str(ip_cidr.network),
-                            bits=int(ip_cidr.prefixlen),
-                            octet=int(conf_net['var-octet']),
-                            quantity=total_units)
+        nets = generate_list_of_cidrs(network=str(ip_cidr.network),
+                                      bits=int(ip_cidr.prefixlen),
+                                      octet=int(conf_net['var-octet']),
+                                      quantity=total_units)
 
     # Ensure lists are the same length & smash into a dictionary
-    check_len = [len(enviros), len(nets), len(junits)]
+    check_len = [len(models), len(nets), len(junits)]
     if check_len != [check_len[0]] * 3:
-        logging.debug('enviros ({}): {}'.format(len(enviros), enviros))
+        logging.debug('models ({}): {}'.format(len(models), models))
         logging.debug('nets ({}): {}'.format(len(nets), nets))
         logging.debug('junits ({}): {}'.format(len(junits), junits))
         raise ValueError('Model, network and juju unit counts should be equal')
-    d_env_data = {'enviros': {}}
-    for idx, enviro in enumerate(enviros):
-        d_env_data['enviros'][enviro] = {
+    d_models_data = {
+        'models': {},
+        'units': {},
+    }
+    for idx, model in enumerate(models):
+        d_models_data['models'][model] = {
             'network': nets[idx],
             'unit': junits[idx]
         }
 
-    # Add neutron networks, subnets and router connections, if called for
-    if net_split is True:
-        build_nets_and_subs(d_env_data=d_env_data,
-                            creds=creds,
-                            conf=conf)
-
-    # Give jenkins master a floating IP if it doesn't already have one
-    float_jenkins_master(creds=creds, conf=conf)
-
-    # Create environment yaml file for each jenkins master & slave unit,
-    # return a dict of files to copy into those units.
-    xfer_files = create_env_yamls_and_post_xfer_dict(data=d_env_data,
-                                                     conf=conf_env,
-                                                     creds=creds)
-
-    # Grab config.xml from jenkins master, replace certain sections
-    ret = parse_jenkins_config_xml(conf_env)
-    if ret:
-        xfer_files.extend(ret)
-
-    # Push in build publisher, mailer, other jenkins config xmls
-    ret = jenkins_other_xml()
-    if ret:
-        xfer_files.extend(ret)
-
-    # Write d_env_data out to yaml for reference
+        d_models_data['units'][junits[idx]] = {
+            'network': nets[idx],
+            'model': model
+        }
+
+    return d_models_data
+
+
+def write_models_data_files(conf, d_models_data):
+    '''Write out yaml files containing models, units, networks data
+       for consumption by osci jenkins slaves.
+    '''
+    conf_other = conf['osci']['other']
+
     logging.debug('New model and network predictions: {}'.format(
-                  yaml.dump(d_env_data, default_flow_style=False)))
-    safe_mkdir(conf_env['out-dir'])
-    write_yaml(d_env_data, '{}/env_data.yaml'.format(conf_env['out-dir']))
-
-    # Build and execute post-deployment file xfer script
-    post_file = make_post_file_xfer_script(
-        data=xfer_files, script_file_abs='{}/{}'.format(
-            conf_env['out-dir'], 'post-xfer.sh'))
-
-    if os.path.isfile(post_file):
-        subprocess.check_call([post_file])
-    else:
-        raise ValueError('Failed to create post-deployment file xfer script.')
+                  yaml.dump(d_models_data, default_flow_style=False)))
+    safe_mkdir(conf_other['out-dir'])
+    write_yaml(d_models_data,
+               '{}/models_data.yaml'.format(conf_other['out-dir']))
+
+    # Generate oscirc files and copy into units
+    for model, v in d_models_data['models'].items():
+        unit_str = v['unit']
+        unit_str_friendly = unit_str.replace('/', '-')
+
+        oscirc_template_data = {
+            'osci_controller_name': model,  # Just use model name
+            'osci_friendly_name': unit_str_friendly,
+            'osci_juju_name': unit_str,
+            'osci_model_name': model,
+            'osci_net_cidr': v['network'],
+            'osci_net_id': v['network-id'],
+        }
+
+        logging.info('{}'.format(oscirc_template_data))
+
+        target = '{}/{}/oscirc'.format(conf_other['out-dir'],
+                                       unit_str_friendly)
+
+        render('oscirc', target, oscirc_template_data, 'templates')
+
+        copy_file_to_juju_unit(target,
+                               '/home/ubuntu/oscirc',
+                               unit_str, owner="ubuntu", group="ubuntu",
+                               perms="640")
+
+        copy_file_to_juju_unit('/home/ubuntu/novarc',
+                               '/home/ubuntu/novarc',
+                               unit_str, owner="ubuntu", group="ubuntu",
+                               perms="640")
+
+        copy_file_on_juju_unit('/home/ubuntu/novarc',
+                               '/var/lib/jenkins/novarc',
+                               unit_str, owner="root", group="root",
+                               perms="644")
+
+        copy_file_on_juju_unit('/home/ubuntu/oscirc',
+                               '/var/lib/jenkins/oscirc',
+                               unit_str, owner="root", group="root",
+                               perms="644")
+
+
+def misc_file_ops(conf, d_models_data):
+    '''Perform misc file operations on units.'''
+
+    for model, v in d_models_data['models'].items():
+        unit_str = v['unit']
+
+        copy_file_on_juju_unit('/home/ubuntu/.bashrc',
+                               '/var/lib/jenkins/.bashrc',
+                               unit_str, owner="jenkins", group="jenkins",
+                               perms="640")
+
+        copy_file_on_juju_unit('/home/ubuntu/.profile',
+                               '/var/lib/jenkins/.profile',
+                               unit_str, owner="jenkins", group="jenkins",
+                               perms="640")
+
+
+def main():
+    '''Main procedure. And, Go!'''
+
+    conf = read_yaml(DEPLOY_CONFIG_FILE)
+    d_models_data = generate_models_data(conf)
+
+    # Build networks and subnets if called for by config
+    if conf['osci']['network']['split']:
+        ksv3_session = get_keystone_v3_session()
+        neutron_c = get_neutron_client(ksv3_session)
+
+        build_nets_and_subs(neutron_c,
+                            d_models_data,
+                            conf)
+
+    write_models_data_files(conf, d_models_data)
+
+    misc_file_ops(conf, d_models_data)
 
 
 if __name__ == '__main__':

=== added file 'deploy/osci-set-subnets-dns.sh'
--- deploy/osci-set-subnets-dns.sh	1970-01-01 00:00:00 +0000
+++ deploy/osci-set-subnets-dns.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash -uex
+# Set nameserver value to the ip address of the current host (bastion) for all
+# neutron subnets.
+
+nameserver_ip="$(ip a | grep glob | head -n 1 | awk '{ print $2 }' | cut -d '/' -f 1)"
+subnets=$(mktemp)
+openstack subnet list | grep "\/" > $subnets
+
+while read i; do
+    subnet_id=$(echo $i | awk '{ print $2 }')
+    openstack subnet set --no-dns-nameservers --dns-nameserver ${nameserver_ip} ${subnet_id}
+done < $subnets
+
+rm -fv $subnets

=== renamed directory 'deployment/bin' => 'deploy/post-deploy'
=== added file 'deploy/post-deploy/100-repo-boot.sh'
--- deploy/post-deploy/100-repo-boot.sh	1970-01-01 00:00:00 +0000
+++ deploy/post-deploy/100-repo-boot.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash -uex
+echo $0
+
+. config/env-common
+
+f_dst="${JENKINS_HOME}"
+f_tmp="${U_HOME}"
+base_src="assets"
+
+for f_src in osci-repo-boot.sh osci-repo-boot-clean.sh; do
+    stat -t ${base_src}/${f_src}
+    for unit in $UNITS; do
+        juju scp ${base_src}/${f_src} ${unit}:${f_tmp}
+        juju ssh ${unit} "sudo cp -fv ${f_tmp}/${f_src} ${f_dst} &&\
+            sudo chown jenkins:jenkins ${f_dst} &&\
+            sudo chmod 750 ${f_dst} &&\
+            sudo chown root:root ${f_dst}/${f_src} &&\
+            sudo chmod 775 ${f_dst}/${f_src}"
+    done
+done

=== added file 'deploy/post-deploy/101-ssh-imports.sh'
--- deploy/post-deploy/101-ssh-imports.sh	1970-01-01 00:00:00 +0000
+++ deploy/post-deploy/101-ssh-imports.sh	2017-05-27 00:22:36 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash -ex
+echo $0
+. config/env-common
+
+ssh_import="1chb1n james-page admcleod thedac vds"
+
+juju run --all "sudo -H -u jenkins bash -c 'ssh-import-id ${ssh_import}'"
+juju run --all "sudo -H -u ubuntu bash -c 'ssh-import-id ${ssh_import}'"
+

=== modified file 'deploy/post-deploy/102-ssh-creds.sh'
--- deployment/bin/102-ssh-creds.sh	2015-02-18 05:22:57 +0000
+++ deploy/post-deploy/102-ssh-creds.sh	2017-05-27 00:22:36 +0000
@@ -1,46 +1,45 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 echo $0
 
 # Copy ssh key files and init bzr lp-login on master and all slaves,
 # verify bzr checkout capability as the jenkins user.
 # FYI nfs checkout is unrelated and arbitrary, chosen for small size ~100k.
 
-. $(dirname $0)/../../env-common
+. config/env-common
 
 f_dst="${JENKINS_HOME}/.ssh"
 f_tmp="${U_HOME}/.ssh"
 f_src="${PUB_KEY} ${PRIV_KEY} ${SSH_CONF}"
-base_src="deploy-files"
+base_src="assets"
 lp_hk=$(cat ${base_src}/launchpad_host_keys)
 d_str=$(date +'%H%M%S')
 
 for srcs in $f_src; do
-  if [ ! -f "${base_src}/${srcs}" ]; then
-    echo "Local source file ${srcs} not found."
-    pwd
-    exit 1
-  fi
+    if [ ! -f "${base_src}/${srcs}" ]; then
+        echo "Local source file ${srcs} not found."
+        pwd
+        exit 1
+    fi
 done
 
 for unit in $UNITS; do
-  echo "Copying SSH key files to ${unit}..."
-  juju ssh ${unit} "sudo mkdir -vp ${f_dst} && sudo mkdir -p ${f_tmp} &&\
-    sudo echo '${lp_hk}' > /tmp/hk${d_str} &&\
-    sudo cp -fv /tmp/hk${d_str} /root/.ssh/known_hosts &&\
-    sudo mv -fv /tmp/hk${d_str} ${f_dst}/known_hosts"
-
-  for srcs in $f_src; do
-    echo "    $srcs --> ${unit}:${f_tmp}"
-    juju scp ${base_src}/${srcs} ${unit}:${f_tmp}
-    juju ssh ${unit} "sudo cp -fv ${f_tmp}/${srcs} ${f_dst}"
-  done
-
-  juju ssh ${unit} "sudo chown -R jenkins:nogroup ${f_dst} &&\
-    sudo chown -R ubuntu:nogroup ${f_tmp} &&\
-    sudo chown -R jenkins:jenkins ${f_dst} &&\
-    sudo chmod 0600 ${f_dst}/known_hosts &&\
-    sudo su - jenkins -c 'bzr whoami \"${BZR_WHOAMI}\"' &&\
-    sudo su - jenkins -c 'bzr launchpad-login $LP_ID' &&\
-    sudo su - jenkins -c 'bzr co --lightweight lp:charms/nfs /tmp/nfs${d_str}'"
+    echo "Copying SSH key files to ${unit}..."
+    juju ssh ${unit} "sudo mkdir -vp ${f_dst} && sudo mkdir -p ${f_tmp} &&\
+        sudo echo '${lp_hk}' > /tmp/hk${d_str} &&\
+        sudo cp -fv /tmp/hk${d_str} /root/.ssh/known_hosts &&\
+        sudo mv -fv /tmp/hk${d_str} ${f_dst}/known_hosts"
+
+    for srcs in $f_src; do
+        echo "    $srcs --> ${unit}:${f_tmp}"
+        juju scp ${base_src}/${srcs} ${unit}:${f_tmp}
+        juju ssh ${unit} "sudo cp -fv ${f_tmp}/${srcs} ${f_dst}"
+    done
+
+    juju ssh ${unit} "sudo chown -R jenkins:nogroup ${f_dst} &&\
+        sudo chown -R ubuntu:nogroup ${f_tmp} &&\
+        sudo chown -R jenkins:jenkins ${f_dst} &&\
+        sudo chmod 0600 ${f_dst}/known_hosts &&\
+        sudo su - jenkins -c 'bzr whoami \"${BZR_WHOAMI}\"' &&\