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

[Ryan Beisner]

For Xenial redeploy and general deployment process cleanup.

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

378. By Ryan Beisner on 2016-08-29

Update deploy script

379. By Ryan Beisner on 2016-08-29

Adjust bundle name

380. By Ryan Beisner on 2016-08-29

Fix validation of unit counts

381. By Ryan Beisner on 2016-08-29

Fix params in get_enviros call

382. By Ryan Beisner on 2016-08-29

Enable deploy script debug

383. By Ryan Beisner on 2016-08-29

Fix unit counts

384. By Ryan Beisner on 2016-08-29

Fix typo

385. By Ryan Beisner on 2016-08-29

Fix net count

386. By Ryan Beisner on 2016-08-29

Update bashrc for juju-1 binary alias, update LP ID

387. By Ryan Beisner on 2016-08-29

Update ssh config

388. By Ryan Beisner on 2016-08-29

Update post-deploy

389. By Ryan Beisner on 2016-08-29

Update plugin list

390. By Ryan Beisner on 2016-08-30

Initial Juju major version switching helper

391. By Ryan Beisner on 2016-08-30

Update packages in charm tools config

392. By Ryan Beisner on 2016-08-30

Use shopt to enable command aliases in jenkins builds

393. By Ryan Beisner on 2016-08-30

Update juju1 bighammer destroyer

394. By Ryan Beisner on 2016-08-30

Deprecate some juju1 legacy helpers

395. By Ryan Beisner on 2016-08-30

Update juju1 model switching

396. By Ryan Beisner on 2016-08-30

Force juju1 in juju1 model switcher

397. By Ryan Beisner on 2016-08-30

Update switcher

398. By Ryan Beisner on 2016-08-30

Ensure JENV_NAME is set

399. By Ryan Beisner on 2016-08-30

No aliases

400. By Ryan Beisner on 2016-08-30

Force big hammer destroyer to use juju-1

401. By Ryan Beisner on 2016-08-30

More adjustments to big hammer destroyer

402. By Ryan Beisner on 2016-08-30

Update big hammer

403. By Ryan Beisner on 2016-08-30

Prefer py35 over py34 for unit tests

404. By Ryan Beisner on 2016-08-30

Disable amulet hotpatches for legacy deb-based install

405. By Ryan Beisner on 2016-08-30

Amulet runner updates

406. By Ryan Beisner on 2016-08-30

Update collection

407. By Ryan Beisner on 2016-08-30

Add python build check script example

408. By Ryan Beisner on 2016-08-30

Update py foo

409. By Ryan Beisner on 2016-08-30

Update py foo

410. By Ryan Beisner on 2016-08-30

Use juju-sym-switch

411. By Ryan Beisner on 2016-08-31

Add cookie distribution

412. By Ryan Beisner on 2016-08-31

Add charm whoami check

413. By Ryan Beisner on 2016-08-31

Update bundle package list

414. By Ryan Beisner on 2016-08-31

Update other hosts

415. By Ryan Beisner on 2016-09-02

Update other hosts, more

416. By Ryan Beisner on 2016-09-06

Disable verbose output on juju-sym-switch

417. By Ryan Beisner on 2016-09-06

Update juju1 deploy_ok check script

418. By Ryan Beisner on 2016-09-06

Switch juju version only once, at init

419. By Ryan Beisner on 2016-09-09

Make temp cleanup output non-verbose; update bighammer destroyer

420. By Ryan Beisner on 2016-09-21

Update jobs

421. By Ryan Beisner on 2016-09-22

Update mappings

422. By Ryan Beisner on 2016-09-22

Stop watching the lp charms which do dangerous sudo pip type things

423. By Ryan Beisner on 2016-09-23

Update gerrit review

424. By Ryan Beisner on 2016-09-23

Move gerrit review job part script into repo

425. By Ryan Beisner on 2016-09-23

Force sim to pass temporarily

426. By Ryan Beisner on 2016-09-23

Make new script executable

427. By Ryan Beisner on 2016-09-23

Update recheck message

428. By Ryan Beisner on 2016-09-23

Enable build number in gerrit table

429. By Ryan Beisner on 2016-09-23

Undo last change

430. By Ryan Beisner on 2016-09-23

Update report

431. By Ryan Beisner on 2016-09-27

Update mappings for freeze

432. By Ryan Beisner on 2016-10-03

Switch juju-wait to its new upstream git repo

=== modified file '.bzrignore'
--- .bzrignore	2016-05-14 03:30:02 +0000
+++ .bzrignore	2016-10-03 16:28:43 +0000
@@ -9,6 +9,7 @@
 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
 hooks
 bin

=== added file 'admin/824-go-cookies-distribute.sh'
--- admin/824-go-cookies-distribute.sh	1970-01-01 00:00:00 +0000
+++ admin/824-go-cookies-distribute.sh	2016-10-03 16:28:43 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash -e
+echo $0
+
+# Copy tarball of go cookies and extract into jenkins homes
+
+. $(dirname $0)/../env-common
+
+f_name="uosci-bot-go-cookies.tar.bz2"
+f_dst_dir="${JENKINS_HOME}"
+f_dst="${f_dst_dir}/${f_name}"
+f_tmp="${U_HOME}/${f_name}"
+f_src_dir="../deployment/deploy-files"
+f_src="${f_src_dir}/${f_name}"
+
+if [ ! -f "$f_src" ]; then
+  echo "Local source file ${f_src} not found."
+  pwd
+  exit 1
+fi
+
+echo $UNITS
+
+for unit in $UNITS; do
+  echo "copying ${f_src} into ${unit}"
+  juju scp $f_src ${unit}:${f_tmp}
+  echo "adjusting permissions"
+  juju ssh $unit "sudo mv $f_tmp $f_dst &&\
+    sudo chown jenkins:jenkins ${f_dst} &&\
+    sudo chmod 600 ${f_dst} &&\
+    sudo su - jenkins -c 'tar -jxvf $f_name'"
+done

=== modified file 'admin/910-bounce-all.sh'
--- admin/910-bounce-all.sh	2015-07-10 21:36:58 +0000
+++ admin/910-bounce-all.sh	2016-10-03 16:28:43 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "rebooting ${unit}!"

=== modified file 'admin/913-shutdown-all.sh'
--- admin/913-shutdown-all.sh	2015-07-10 21:36:58 +0000
+++ admin/913-shutdown-all.sh	2016-10-03 16:28:43 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "shutting down ${unit}!"

=== modified file 'admin/920-juju-bootstrap-all.sh'
--- admin/920-juju-bootstrap-all.sh	2015-07-10 21:36:58 +0000
+++ admin/920-juju-bootstrap-all.sh	2016-10-03 16:28:43 +0000
@@ -5,7 +5,7 @@
 # useful for verifying juju environments and networks
 
 # Get jenkins units
-units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
   | cut -d ":" -f 1 | sed 's/^ *//')
 
 for unit in $units; do

=== modified file 'admin/924-check-juju-enviros.sh'
--- admin/924-check-juju-enviros.sh	2015-07-10 21:36:58 +0000
+++ admin/924-check-juju-enviros.sh	2016-10-03 16:28:43 +0000
@@ -4,7 +4,7 @@
 # look at juju enviro yamls
 
 # Get jenkins units
-units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
   | cut -d ":" -f 1 | sed 's/^ *//')
 
 for unit in $units; do

=== modified file 'admin/925-juju-destroy-all.sh'
--- admin/925-juju-destroy-all.sh	2015-07-10 21:36:58 +0000
+++ admin/925-juju-destroy-all.sh	2016-10-03 16:28:43 +0000
@@ -15,7 +15,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 
   for unit in $units; do

=== modified file 'admin/926-juju-delete-enviro-files-all.sh'
--- admin/926-juju-delete-enviro-files-all.sh	2015-07-10 21:36:58 +0000
+++ admin/926-juju-delete-enviro-files-all.sh	2016-10-03 16:28:43 +0000
@@ -17,7 +17,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 
   if [ -z "$units" ]; then

=== modified file 'admin/930-images-delete.sh'
--- admin/930-images-delete.sh	2015-07-10 21:36:58 +0000
+++ admin/930-images-delete.sh	2016-10-03 16:28:43 +0000
@@ -13,7 +13,7 @@
 fi
 
 # Get jenkins units
-units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave|lab|task)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 for unit in $units; do
   echo "----- ${unit} -----"

=== modified file 'deploy-prep.sh'
--- deploy-prep.sh	2016-02-12 18:32:42 +0000
+++ deploy-prep.sh	2016-10-03 16:28:43 +0000
@@ -2,7 +2,7 @@
 
 # Pre-deployment prep for bastion instance
 
-sudo apt-get update -y 
+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

=== modified file 'deploy-uosci.py'
--- deploy-uosci.py	2016-02-09 11:59:39 +0000
+++ deploy-uosci.py	2016-10-03 16:28:43 +0000
@@ -30,12 +30,16 @@
 )
 
 # Set default logging level
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 
 EV = 'environments'
 DEPLOY_CONFIG_FILE = 'deployment/deploy-config.yaml'
 JM_NAME_TEMPL = 'osci/{}'
-JS_NAME_TEMPL = 'osci-slave/{}'
+SLAVE_NAME_TEMPLATES = {
+    'slave': 'osci-slave/{}',  # jsv
+    'lab': 'osci-lab/{}',      # jlb
+    'task': 'osci-task/{}'     # jtk
+}
 
 
 def validate_network_config(conf):
@@ -72,27 +76,40 @@
     return ret
 
 
-def get_junits(js_qty):
+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 unit in range(0, js_qty):
-        units.append(JS_NAME_TEMPL.format(unit))
+
+    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, js_qty):
-    '''Return a list of juju environment names to create'''
+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 unit in range(0, js_qty):
-        envs.append("{}-{}{}".format(conf_env['env-name-base'],
-                                     conf_env['slave-abbrv'],
-                                     str(unit).zfill(2)))
+
+    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
 
 
@@ -119,7 +136,7 @@
                                      net_str.split('.')[int(var_oct) - 1],
                                      'net')
 
-        # Create network if available
+        # Create neutron network
         networks = neutron.list_networks(name=net_name)
         if len(networks['networks']) == 0:
             logging.info('Creating network: %s',
@@ -163,12 +180,11 @@
             logging.info('Subnet %s already exists.', net_name)
             neu_subnet = subnets['subnets'][0]
 
-        # Wire the network into the router
+        # Wire the network to the router
         routers = neutron.list_routers(name=router_name)
         if len(routers['routers']) == 0:
             raise ValueError('Unable to locate router')
         else:
-            # Check to see if subnet already plugged into router
             ports = neutron.list_ports(device_owner='network:router_interface',
                                        network_id=neu_network['id'])
             if len(ports['ports']) == 0:
@@ -183,7 +199,7 @@
         d_env_data['enviros'][k]['network-id'] = str(neu_network['id'])
 
 
-def is_deployed(jm_num_units, js_num_units):
+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
     '''
@@ -192,23 +208,34 @@
         # Deployed, check unit quantities
         jm_stat = yaml.load(subprocess.check_output(
                             ['juju', 'status', 'osci']))
-        js_stat = yaml.load(subprocess.check_output(
+        jsv_stat = yaml.load(subprocess.check_output(
                             ['juju', 'status', 'osci-slave']))
-        jm_count = len(jm_stat['services']['osci']['units'])
-        js_count = len(js_stat['services']['osci-slave']['units'])
-        if int(jm_count) != jm_num_units:
-            ret = ('Juju enviro is up, but jenkins master'
-                   'count is unexpected: {}/{}'.format(jm_count, jm_num_units))
-        if int(js_count) != js_num_units:
-            ret = ('Juju enviro is up, but jenkins slave'
-                   'count is unexpected: {}/{}'.format(js_count, js_num_units))
-    except subprocess.CalledProcessError:
+        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
-    except Exception:
-        # Something went wrong
-        logging.error('unknown juju status error')
-        ret = 'unknown juju status error'
     return ret
 
 
@@ -278,12 +305,12 @@
         env_name_dev = '{}-jdev'.format(env_name)
         env_name_prop = '{}-jprop'.format(env_name)
 
-        # Set this slave's juju environment 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 environment openstack parameters
+        # 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())
@@ -299,15 +326,15 @@
         else:
             del d_tmp[EV][env_name]['apt-http-proxy']
 
-        # Create juju-devel environment
+        # 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 environment
+        # 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 environment yaml files
+        # 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)
@@ -529,42 +556,65 @@
     # Inspect deployer bundle yaml for needed info & validate
     deployer_bundle = conf['osci']['deployer-bundle']
     d_dep_bundle = read_yaml(deployer_bundle)
-    jm_num_units = get_num_units(d_dep_bundle,
-                                 d_dep_bundle.keys()[0],
-                                 'osci')
-    js_num_units = get_num_units(d_dep_bundle,
-                                 d_dep_bundle.keys()[0],
-                                 'osci-slave')
-    logging.debug('jm, js: {}, {}'.format(jm_num_units, js_num_units))
+    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))
 
-    if jm_num_units != 1:
+    # Validate bundle unit counts before deploying
+    if jma_num_units != 1:
         raise ValueError('Expected exactly 1 jenkins master, '
-                         'found: {}'.format(jm_num_units))
-    if js_num_units < 1:
+                         'found: {}'.format(jma_num_units))
+    if jsv_num_units < 1:
         raise ValueError('Expected at least 1 jenkins slave, '
-                         'found: {}'.format(js_num_units))
+                         '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(jm_num_units, js_num_units)
+    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('environment is already deployed, moving on.')
+        logging.info('Model is already deployed, moving on.')
     elif ret is False:
-        logging.info('environment is available, deploying...')
+        logging.info('Model is not deployed, deploying...')
         subprocess.check_call(['juju-deployer',
                                '-v', '-d', '-B',
                                '-c', deployer_bundle])
         # Confirm new deployment
-        ret = is_deployed(jm_num_units, js_num_units)
+        ret = is_deployed(jma_num_units, jsv_num_units,
+                          jtk_num_units, jlb_num_units)
         if ret is not True:
             raise ValueError(ret)
 
-    # Construct new juju environment and unit names lists
-    junits = get_junits(js_qty=js_num_units)
-    enviros = get_enviros(conf_env=conf_env, js_qty=js_num_units)
-
-    # Split network or flat network?
+    # 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)
+
+    # Network separation
     if net_split is False:
         logging.info('No network separation.')
         nets = [None] * len(junits)
@@ -586,15 +636,20 @@
 
         # Construct new network config data list
         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=js_num_units + jm_num_units)
+                            quantity=total_units)
 
     # Ensure lists are the same length & smash into a dictionary
     check_len = [len(enviros), len(nets), len(junits)]
     if check_len != [check_len[0]] * 3:
-        raise ValueError('Ergh.  Flawed construction logic.  My bad.')
+        logging.debug('enviros ({}): {}'.format(len(enviros), enviros))
+        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] = {
@@ -628,7 +683,7 @@
         xfer_files.extend(ret)
 
     # Write d_env_data out to yaml for reference
-    logging.debug('new enviro and network predictions: {}'.format(
+    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']))

=== added file 'deployment/111-osci1-xenial.yaml'
--- deployment/111-osci1-xenial.yaml	1970-01-01 00:00:00 +0000
+++ deployment/111-osci1-xenial.yaml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,63 @@
+# See also local config.yaml and README
+# Be aware that neutron networks are dynamically generated based on
+# these units.  Naming of 'osci' and 'osci-slave' are
+# significant to deployment and post-deployment scripts.
+ubuntu-openstack-ci:
+  series: xenial
+  services:
+    osci:
+      branch: lp:~1chb1n/+junk/jenkins-reactive-temp-build
+      num_units: 1
+      constraints: mem=4152M
+      options:
+# TODO - develop charm config option for plugin proxy and use it here
+# TODO - develop charm config option for ssh-import-ids in master and slave charms
+# TODO - develop charm config option for add-apt-ppa (prior to tools installation) in master and slave charms
+# TODO - make existing jenkins sudoer decision (has sudo by default) configurable in the reactive charm
+# TODO - copy .bashrc and .bash_profile from ubuntu home to jenkins home in the master and slave charms
+        master-executors: 1
+        remove-unlisted-plugins: "no"
+        release: bundle  # place jenkins.deb in charm ./files/ dir before deploy
+        tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest python3-openstackclient python-openstackclient juju juju-1.25 juju-deployer lxd zfsutils-linux python-jinja2 python3-swiftclient amulet python-ceilometerclient python-cinderclient python-glanceclient python-heatclient python-keystoneclient python-launchpadlib python-neutronclient python-novaclient python-openstackclient python-swiftclient python3-amqp openvswitch-test openvswitch-common python-pika pwgen ipcalc
+        username: ubuntu
+        password: ubuntu
+    osci-slave:
+      branch: lp:~1chb1n/+junk/jenkins-slave-legacy-mash
+      num_units: 16
+      constraints: mem=2G
+      options:
+        slave-executors: 1
+        tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest python3-openstackclient python-openstackclient juju juju-1.25 juju-deployer lxd zfsutils-linux python-jinja2 python3-swiftclient amulet python-ceilometerclient python-cinderclient python-glanceclient python-heatclient python-keystoneclient python-launchpadlib python-neutronclient python-novaclient python-openstackclient python-swiftclient python3-amqp openvswitch-test openvswitch-common python-pika pwgen ipcalc
+        labels: slave
+    osci-lab:
+      branch: lp:~1chb1n/+junk/jenkins-slave-legacy-mash
+      num_units: 4
+      constraints: mem=2G
+      options:
+        slave-executors: 1
+        tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest python3-openstackclient python-openstackclient juju juju-1.25 juju-deployer lxd zfsutils-linux python-jinja2 python3-swiftclient amulet python-ceilometerclient python-cinderclient python-glanceclient python-heatclient python-keystoneclient python-launchpadlib python-neutronclient python-novaclient python-openstackclient python-swiftclient python3-amqp openvswitch-test openvswitch-common python-pika pwgen ipcalc
+        labels: lab
+    osci-task:
+      branch: lp:~1chb1n/+junk/jenkins-slave-legacy-mash
+      num_units: 2
+      constraints: mem=4152M
+      options:
+        slave-executors: 16
+        tools: build-essential ubuntu-dev-tools bzr git git-review python-virtualenv python3-virtualenv tox snapd snapcraft iptraf htop nmap nload multitail wget ipcalc libffi-dev libssl-dev libdbus-1-dev libdbus-glib-1-dev python3-pytest python3-openstackclient python-openstackclient juju juju-1.25 juju-deployer lxd zfsutils-linux python-jinja2 python3-swiftclient amulet python-ceilometerclient python-cinderclient python-glanceclient python-heatclient python-keystoneclient python-launchpadlib python-neutronclient python-novaclient python-openstackclient python-swiftclient python3-amqp openvswitch-test openvswitch-common python-pika pwgen ipcalc
+        labels: task
+
+# TODO - devpi for caching pypi
+#        develop charm, possibly inspired by http://bazaar.launchpad.net/~chris-gondolin/charms/trusty/pypi-mirror/trunk
+#    pypi-mirror:
+
+# TODO -  osci master admin/config subordinate
+#    osci-master-admin:
+#      * prep /mnt ephemeral dirs and perms for local charm build ssh pushes
+#
+  relations:
+    - - "osci:master"
+      - "osci-slave:slave"
+    - - "osci:master"
+      - "osci-lab:slave"
+    - - "osci:master"
+      - "osci-task:slave"

=== modified file 'deployment/bin/100-jenkins-user.sh'
--- deployment/bin/100-jenkins-user.sh	2014-10-02 15:18:00 +0000
+++ deployment/bin/100-jenkins-user.sh	2016-10-03 16:28:43 +0000
@@ -7,9 +7,14 @@
 
 j_sudoer="jenkins ALL=(ALL) NOPASSWD:ALL"
 f_sudoer="/etc/sudoers.d/900-jenkins"
+base_src="deploy-files"
+f_src="bashrc"
+f_dst="${U_HOME}/.bashrc"
 
 # Set master and slaves
 for unit in $UNITS; do
+  juju scp ${base_src}/${f_src} ${unit}:${f_dst}
+  # Copy bashrc file in for aliases
   # Add sudoers.d file if it doesn't contain what we want
   juju ssh $unit "sudo grep '${j_sudoer}' ${f_sudoer} >> \
     /dev/null 2>&1 ||\

=== renamed file 'deployment/bin/104-juju-openstack-packages.sh' => 'deployment/bin/104-dirs-and-packages.sh'
--- deployment/bin/104-juju-openstack-packages.sh	2016-03-09 22:01:42 +0000
+++ deployment/bin/104-dirs-and-packages.sh	2016-10-03 16:28:43 +0000
@@ -1,32 +1,35 @@
 #!/bin/bash -e
 echo $0
 
-# Install juju, amulet, openstack clients on master and all slaves
+# Ensure directories are created; Install juju packages
 
 . $(dirname $0)/../../env-common
 
 mkdirs="sudo mkdir -vp ${JENKINS_HOME}/tools &&\
         sudo mkdir -vp ${JENKINS_HOME}/.config/tarmac &&\
         sudo mkdir -vp ${FILE_TRIGGER_DIR} &&\
-        sudo chown jenkins:jenkins -R ${JENKINS_HOME}"
-
-cmd_ca="sudo add-apt-repository ppa:juju/stable -y && sudo apt-get update -y"
-
-cmd_base="sudo apt-get install git testrepository subunit python-nose python-lxml python-boto \
-        python-junitxml python-subunit python-boto python-testresources python-oslotest python-stevedore \
-        python-cinderclient python-glanceclient python-heatclient python-keystoneclient \
-        python-neutronclient python-novaclient python-swiftclient python-ceilometerclient \
-        amulet charm-tools juju-deployer juju-core iptraf htop nmap nload multitail wget lynx \
-        python-distro-info distro-info python-jinja2 python3-jinja2 pastebinit pylint \
-        python-coverage python-netifaces python-psutil \
-        iperf gcc python-dev python-virtualenv python-apt \
-        openvswitch-test openvswitch-common python-pymongo python-lockfile \
-        python-flake8 ppa-purge lxc python-dnspython python-tox -y"
-
-cmd_osci="$cmd_ca && $cmd_base && ${mkdirs}"
-cmd_osci_slave="$cmd_ca && $cmd_base && sudo update-rc.d jenkins-slave defaults && ${mkdirs}"
-
-echo "========== osci service units =========="
-juju run --timeout 10m --format yaml --service osci "$cmd_osci"
-echo "========== osci-slave service units =========="
-juju run --timeout 10m --format yaml --service osci-slave "$cmd_osci_slave"
+        sudo chown jenkins:jenkins -R ${JENKINS_HOME} &&\
+        sudo mkdir -vp /mnt/jenkins-ssh-artifact-storage &&\
+        sudo chown jenkins:jenkins -R /mnt/jenkins-ssh-artifact-storage"
+
+pkgs="juju juju-2.0 juju-1.25 juju-deployer charm-tools"
+cmd="sudo add-apt-repository ppa:juju/stable -y && sudo apt-get update -y && sudo apt-get install $pkgs -y && sudo apt-get upgrade -y"
+
+# Packages should be expressed as 'tools' in the charm config (bundle)
+#
+#cmd_base="sudo apt-get install git testrepository subunit python-nose python-lxml python-boto \
+#        python-junitxml python-subunit python-boto python-testresources python-oslotest python-stevedore \
+#        python-cinderclient python-glanceclient python-heatclient python-keystoneclient \
+#        python-neutronclient python-novaclient python-swiftclient python-ceilometerclient \
+#        amulet charm-tools juju-deployer juju-core iptraf htop nmap nload multitail wget lynx \
+#        python-distro-info distro-info python-jinja2 python3-jinja2 pastebinit pylint \
+#        python-coverage python-netifaces python-psutil \
+#        iperf gcc python-dev python-virtualenv python-apt \
+#        openvswitch-test openvswitch-common python-pymongo python-lockfile \
+#        python-flake8 ppa-purge lxc python-dnspython python-tox -y"
+
+juju run --service osci "$mkdirs"
+juju run --service osci "$cmd"
+juju run --service osci-lab "$cmd"
+juju run --service osci-task "$cmd"
+juju run --service osci-slave "$cmd"

=== renamed file 'deployment/bin/106-paramiko-trusty-fixup.sh' => 'deployment/bin/deprecated/106-paramiko-trusty-fixup.sh'
=== modified file 'deployment/deploy-config.yaml'
--- deployment/deploy-config.yaml	2015-01-07 19:32:26 +0000
+++ deployment/deploy-config.yaml	2016-10-03 16:28:43 +0000
@@ -1,14 +1,14 @@
 # Config options for deployment and post-deployment actions
 osci:
-  deployer-bundle: "deployment/110-uosci-trusty.yaml"
+  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 environment, and added to a single existing
+    # 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 environments, to have its octet
+    # Base network for jenkins slave juju models, to have its octet
     # incremented X number of times.  Stick with /24 and /16!
     cidr: "172.17.99.0/24"
 
@@ -26,7 +26,7 @@
     neutron-sub: "oscisub"
 
     # DNS servers (comma separated) for the new subnet:
-    neutron-dns: "10.5.0.2"
+    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):
@@ -34,15 +34,17 @@
     fip-str: "10.245.162"
 
   enviro:
-    # New juju environment naming control:
+    # New juju model naming control:
     env-name-base: "osci"
     master-abbrv: "ma"
     slave-abbrv: "sv"
+    task-abbrv: "tk"
+    lab-abbrv: "lb"
 
-    # Template for new juju environments:
+    # Template for new juju environments.yaml files:
     env-template: "deployment/deploy-files/environments.yaml"
 
-    # Local juju environment;  will pull apt proxy from first env found:
+    # Local juju model;  will pull apt proxy from first env found:
     env-reference: "/home/ubuntu/.juju/environments.yaml"
 
     # Directory for misc output files:

=== modified file 'deployment/deploy-files/bashrc'
--- deployment/deploy-files/bashrc	2014-10-02 15:18:00 +0000
+++ deployment/deploy-files/bashrc	2016-10-03 16:28:43 +0000
@@ -37,7 +37,7 @@
 
 # set a fancy prompt (non-color, unless we know we "want" color)
 case "$TERM" in
-    xterm-color) color_prompt=yes;;
+    xterm-color|*-256color) color_prompt=yes;;
 esac
 
 # uncomment for a colored prompt, if the terminal has the capability; turned
@@ -47,12 +47,12 @@
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
+    # We have color support; assume it's compliant with Ecma-48
+    # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+    # a case would tend to support setf rather than setaf.)
+    color_prompt=yes
     else
-	color_prompt=
+    color_prompt=
     fi
 fi
 
@@ -84,6 +84,9 @@
     alias egrep='egrep --color=auto'
 fi
 
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
 # some more ls aliases
 alias ll='ls -alF'
 alias la='ls -A'
@@ -112,7 +115,7 @@
     . /etc/bash_completion
   fi
 fi
-[ -r /home/ubuntu/.byobu/prompt ] && . /home/ubuntu/.byobu/prompt   #byobu-prompt#
 
 
 export AMULET_HTTP_PROXY='http://squid.internal:3128'
+alias juju=juju-1  # Default to juju 1.x binary

=== modified file 'deployment/deploy-files/config'
--- deployment/deploy-files/config	2015-02-18 04:49:11 +0000
+++ deployment/deploy-files/config	2016-10-03 16:28:43 +0000
@@ -1,3 +1,4 @@
 # default ssh config for slaves
 Host *
   User ubuntu
+PubkeyAcceptedKeyTypes +ssh-dss

=== modified file 'deployment/deploy-files/hudson.tasks.Mailer.xml'
--- deployment/deploy-files/hudson.tasks.Mailer.xml	2014-10-02 15:18:00 +0000
+++ deployment/deploy-files/hudson.tasks.Mailer.xml	2016-10-03 16:28:43 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hudson.tasks.Mailer_-DescriptorImpl plugin="mailer@1.11">
-  <smtpHost>batuan.canonical.com</smtpHost>
+  <smtpHost>mx.canonical.com</smtpHost>
   <useSsl>false</useSsl>
   <charset>UTF-8</charset>
 </hudson.tasks.Mailer_-DescriptorImpl>

=== modified file 'deployment/deploy-files/other_host_keys'
--- deployment/deploy-files/other_host_keys	2016-06-10 22:45:55 +0000
+++ deployment/deploy-files/other_host_keys	2016-10-03 16:28:43 +0000
@@ -1,1 +1,4 @@
 |1|NOsKEQA0bWoNsWggMjeeDIjUchM=|qgKqfZHitSee+cWTbZvjGMOQ7Og= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOVTyPIM+V+75ATRgIG2qQXvcfB1fYPGpRHPPTUBvVETA0QRvKpN8VwupbXvmuPm+6Rz4usBTDp9BOMh5zbcoPc=
+|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=

=== modified file 'deployment/deploy-files/plugins'
--- deployment/deploy-files/plugins	2014-10-03 21:52:24 +0000
+++ deployment/deploy-files/plugins	2016-10-03 16:28:43 +0000
@@ -2,7 +2,9 @@
 build-name-setter
 build-pipeline-plugin
 build-publisher
+build-user-vars-plugin
 compress-artifacts
+conditional-buildstep
 copyartifact
 credentials
 dashboard-view
@@ -10,22 +12,40 @@
 downstream-buildview
 email-ext
 fstrigger
+gerrit-trigger
+git-client
+github-api
+github
 git
-git-client
+global-build-stats
 greenballs
 instant-messaging
 ircbot
 jobConfigHistory
 mailer
+mapdb-api
+matrix-auth
+matrix-project
+maven-plugin
 nested-view
 nodelabelparameter
+pam-auth
 parameterized-trigger
+publish-over-ssh
 purge-build-queue-plugin
 rebuild
+run-condition
+s3
 scm-api
+script-security
 shelve-project-plugin
+simple-parameterized-builds-report
 simple-theme-plugin
+ssh-credentials
 startup-trigger-plugin
 template-project
 throttle-concurrents
 timestamper
+token-macro
+urltrigger
+ws-cleanup

=== modified file 'deployment/jobs/_apt_maint_nodes/config.xml'
--- deployment/jobs/_apt_maint_nodes/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/_apt_maint_nodes/config.xml	2016-10-03 16:28:43 +0000
@@ -2,24 +2,33 @@
 <project>
   <actions/>
   <description>Do scheduled apt updating/upgrading periodically on all master/slaves.</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>
-        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name></name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
           </allowedSlaves>
           <defaultSlaves>
-            <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>
@@ -28,10 +37,6 @@
             <string>osci-slave-13</string>
             <string>osci-slave-14</string>
             <string>osci-slave-15</string>
-            <string>osci-slave-16</string>
-            <string>osci-slave-17</string>
-            <string>osci-slave-18</string>
-            <string>osci-slave-19</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -40,6 +45,8 @@
             <string>osci-slave-7</string>
             <string>osci-slave-8</string>
             <string>osci-slave-9</string>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -49,15 +56,14 @@
         </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
       </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>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>
@@ -94,14 +100,16 @@
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deployment/jobs/_bak_jenkins_home_no_build_history'
=== added file 'deployment/jobs/_bak_jenkins_home_no_build_history/config.xml'
--- deployment/jobs/_bak_jenkins_home_no_build_history/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/_bak_jenkins_home_no_build_history/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,71 @@
+<?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>-1</numToKeep>
+        <artifactDaysToKeep>180</artifactDaysToKeep>
+        <artifactNumToKeep>100</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <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>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
+      <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>master</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>H 2 * * 0</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <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>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
+      <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
+      <externalDelete></externalDelete>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/_bucket_junk_cleanup/config.xml'
--- deployment/jobs/_bucket_junk_cleanup/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/_bucket_junk_cleanup/config.xml	2016-10-03 16:28:43 +0000
@@ -2,28 +2,33 @@
 <project>
   <actions/>
   <description>Periodically delete junk objects from swift container (such as sandbox results)</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.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</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>slave||lab</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -55,14 +60,16 @@
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/_bucket_update_indices/config.xml'
--- deployment/jobs/_bucket_update_indices/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/_bucket_update_indices/config.xml	2016-10-03 16:28:43 +0000
@@ -2,28 +2,33 @@
 <project>
   <actions/>
   <description>Update Index of Indices in the blob bucket (list of all index.html files)</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.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</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>master||slave</assignedNode>
+  <assignedNode>master||slave||lab</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -54,14 +59,16 @@
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deployment/jobs/_charm_whoami_check'
=== added file 'deployment/jobs/_charm_whoami_check/config.xml'
--- deployment/jobs/_charm_whoami_check/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/_charm_whoami_check/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,122 @@
+<?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>-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>
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
+          <name>nodes</name>
+          <description></description>
+          <allowedSlaves>
+            <string>ALL (no restriction)</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-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>
+            <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>
+            <string>osci-task-0</string>
+            <string>osci-task-1</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">
+        <string>false</string>
+      </categories>
+      <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||lab||master||task</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <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 -ex
+${OSCI_ROOT}/job-parts/build_charm_whoami_check.py
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*, build/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <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.30">
+      <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
+      <externalDelete></externalDelete>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/_juju_bighammer_destroy_this/config.xml'
--- deployment/jobs/_juju_bighammer_destroy_this/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/_juju_bighammer_destroy_this/config.xml	2016-10-03 16:28:43 +0000
@@ -5,24 +5,33 @@
 * then juju stat to see how it went&#xd;
 * useful in funky sticky situations where deployments failed mid-stream and left an environment in a bad state&#xd;
 </description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>90</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</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.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name>NODE_NAME</name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
           </allowedSlaves>
           <defaultSlaves>
-            <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>
@@ -31,10 +40,6 @@
             <string>osci-slave-13</string>
             <string>osci-slave-14</string>
             <string>osci-slave-15</string>
-            <string>osci-slave-16</string>
-            <string>osci-slave-17</string>
-            <string>osci-slave-18</string>
-            <string>osci-slave-19</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -43,6 +48,8 @@
             <string>osci-slave-7</string>
             <string>osci-slave-8</string>
             <string>osci-slave-9</string>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -52,15 +59,14 @@
         </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
       </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>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>
@@ -77,7 +83,6 @@
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 f_fresh_clean_start
 f_delete_neutron_ext_net_ports
-f_juju_source_reset
 f_check_fail</command>
     </hudson.tasks.Shell>
   </builders>
@@ -88,12 +93,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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deployment/jobs/_juju_bin_check_foo'
=== added file 'deployment/jobs/_juju_bin_check_foo/config.xml'
--- deployment/jobs/_juju_bin_check_foo/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/_juju_bin_check_foo/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,194 @@
+<?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>-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>
+          <name>BASE_NAME</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_TAG</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_TOPIC</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_PROJECT</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_NUMBER</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_ID</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_PATCHSET_NUMBER</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_PATCHSET_UPLOADER_NAME</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_PATCHSET_REVISION</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_SUBJECT</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_URL</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_SUBJECT</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_CHANGE_URL</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_REFSPEC</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GERRIT_BRANCH</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BUILT_ASSET_ARTIFACT_ARCHIVE_NAME</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BUILT_ASSET_BASE_NAME</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BUILT_ASSET_SHA1</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </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"/>
+      <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>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <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
+
+# Source the common functions
+. ${OSCI_ROOT}/job-parts/osci_job_common.sh
+
+f_fresh_clean_start
+f_env_no_pass
+f_touch_try
+
+f_line FOO
+set -x
+f_go_juju1
+juju version
+which juju
+${OSCI_ROOT}/job-parts/build_foo.py
+set +x
+f_nice_finish
+f_check_fail</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*, build/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <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

=== modified file 'deployment/jobs/_juju_bootstrap_this/config.xml'
--- deployment/jobs/_juju_bootstrap_this/config.xml	2016-01-14 04:23:44 +0000
+++ deployment/jobs/_juju_bootstrap_this/config.xml	2016-10-03 16:28:43 +0000
@@ -4,23 +4,33 @@
   <description>* juju bootstrap a single or multiple nodes, then check and juju destroy.&#xd;
 * useful in troubleshooting or validating infrastructure or tool sets&#xd;
 </description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>90</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</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.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name>NODE_NAME</name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</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>
@@ -29,10 +39,6 @@
             <string>osci-slave-13</string>
             <string>osci-slave-14</string>
             <string>osci-slave-15</string>
-            <string>osci-slave-16</string>
-            <string>osci-slave-17</string>
-            <string>osci-slave-18</string>
-            <string>osci-slave-19</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -41,6 +47,8 @@
             <string>osci-slave-7</string>
             <string>osci-slave-8</string>
             <string>osci-slave-9</string>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -50,14 +58,14 @@
         </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </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>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>
@@ -90,6 +98,8 @@
 fi
 f_line &quot;End of bootstrap&quot;
 
+juju status
+
 f_collect_juju_logs
 f_set_build_descr
 #f_nice_finish
@@ -104,12 +114,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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/_juju_stat_this/config.xml'
--- deployment/jobs/_juju_stat_this/config.xml	2015-01-21 05:51:34 +0000
+++ deployment/jobs/_juju_stat_this/config.xml	2016-10-03 16:28:43 +0000
@@ -4,28 +4,51 @@
   <description>* juju stat a single node or multiple nodes&#xd;
 * no destroy, just a probe&#xd;
 * useful in troubleshooting</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>90</artifactDaysToKeep>
-    <artifactNumToKeep>90</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>90</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>
-        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name>NODE_NAME</name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
           </allowedSlaves>
           <defaultSlaves>
-            <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-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>
+            <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>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -35,14 +58,14 @@
         </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </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>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>
@@ -66,12 +89,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.5.15"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== added directory 'deployment/jobs/_juju_version'
=== added file 'deployment/jobs/_juju_version/config.xml'
--- deployment/jobs/_juju_version/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/_juju_version/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,101 @@
+<?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>Concurrent Multiple Nodes</name>
+          <description></description>
+          <allowedSlaves>
+            <string>ALL (no restriction)</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-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>
+            <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>
+            <string>osci-task-0</string>
+            <string>osci-task-1</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>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"/>
+  <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 -ex
+
+juju version
+
+juju-1.25 version
+
+juju-2.0 version</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/_no_op/config.xml'
--- deployment/jobs/_no_op/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/_no_op/config.xml	2016-10-03 16:28:43 +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,15 +35,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>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>
@@ -51,6 +56,18 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+
+. ${OSCI_ROOT}/job-parts/osci_job_common.sh
+
+f_line &quot;Flip-flopping Juju major versions&quot;
+juju version
+f_juju_2
+juju version
+f_juju_1
+juju version</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
       <command>#!/bin/bash -ex
 uname -a
 uptime
@@ -65,17 +82,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.30">
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/_run_command/config.xml'
--- deployment/jobs/_run_command/config.xml	2015-01-20 23:12:35 +0000
+++ deployment/jobs/_run_command/config.xml	2016-10-03 16:28:43 +0000
@@ -5,24 +5,33 @@
 * useful for maintenance, system administration, or node troubleshooting&#xd;
 * artifacts are collected from $WORKSPACE if they exist&#xd;
 </description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>90</artifactDaysToKeep>
-    <artifactNumToKeep>90</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>90</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>
-        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name>NODE_NAME</name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
           </allowedSlaves>
           <defaultSlaves>
-            <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>
@@ -31,10 +40,6 @@
             <string>osci-slave-13</string>
             <string>osci-slave-14</string>
             <string>osci-slave-15</string>
-            <string>osci-slave-16</string>
-            <string>osci-slave-17</string>
-            <string>osci-slave-18</string>
-            <string>osci-slave-19</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -43,6 +48,8 @@
             <string>osci-slave-7</string>
             <string>osci-slave-8</string>
             <string>osci-slave-9</string>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -57,14 +64,14 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </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>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>
@@ -88,12 +95,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.5.14"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/_system_tools_init/config.xml'
--- deployment/jobs/_system_tools_init/config.xml	2016-01-14 04:23:44 +0000
+++ deployment/jobs/_system_tools_init/config.xml	2016-10-03 16:28:43 +0000
@@ -2,24 +2,33 @@
 <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>
-  <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>
-        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.5.1">
+        <org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition plugin="nodelabelparameter@1.7.2">
           <name>Concurrent Multiple Nodes</name>
           <description></description>
           <allowedSlaves>
             <string>ALL (no restriction)</string>
           </allowedSlaves>
           <defaultSlaves>
-            <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>
@@ -28,10 +37,6 @@
             <string>osci-slave-13</string>
             <string>osci-slave-14</string>
             <string>osci-slave-15</string>
-            <string>osci-slave-16</string>
-            <string>osci-slave-17</string>
-            <string>osci-slave-18</string>
-            <string>osci-slave-19</string>
             <string>osci-slave-2</string>
             <string>osci-slave-3</string>
             <string>osci-slave-4</string>
@@ -40,6 +45,8 @@
             <string>osci-slave-7</string>
             <string>osci-slave-8</string>
             <string>osci-slave-9</string>
+            <string>osci-task-0</string>
+            <string>osci-task-1</string>
           </defaultSlaves>
           <triggerIfResult>allowMultiSelectionForConcurrentBuilds</triggerIfResult>
           <allowMultiNodeSelection>true</allowMultiNodeSelection>
@@ -49,14 +56,14 @@
         </org.jvnet.jenkins.plugins.nodelabelparameter.NodeParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </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>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>
@@ -77,6 +84,8 @@
 #
 #  Common functions for UOSCI jobs, specific to refreshing tool branches.
 
+mkdir -vp /var/lib/jenkins/tools ||:
+
 [[ -z &quot;$JUJU_WAIT_REPO&quot; ]] &amp;&amp; export JUJU_WAIT_REPO=&quot;lp:juju-wait&quot;
 [[ -z &quot;$JUJU_WAIT_ROOT&quot; ]] &amp;&amp; export JUJU_WAIT_ROOT=&quot;${HOME}/tools/juju-wait&quot;
 
@@ -146,9 +155,11 @@
   </builders>
   <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/amulet_full_matrix/config.xml'
--- deployment/jobs/amulet_full_matrix/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/amulet_full_matrix/config.xml	2016-10-03 16:28:43 +0000
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<matrix-project plugin="matrix-project@1.4.1">
+<matrix-project plugin="matrix-project@1.7.1">
   <actions/>
   <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>60</numToKeep>
-    <artifactDaysToKeep>120</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>60</numToKeep>
+        <artifactDaysToKeep>120</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
     <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>1</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <matrixOptions>
         <throttleMatrixBuilds>true</throttleMatrixBuilds>
         <throttleMatrixConfigurations>true</throttleMatrixConfigurations>
       </matrixOptions>
+      <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>slave||lab</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H 23 * * 6
-H 23 * * 4
+      <spec>H 23 * * 5
 H 23 * * 2</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
@@ -45,22 +51,29 @@
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable/16.04</string>
+        <string>stable/16.07</string>
       </values>
     </hudson.matrix.TextAxis>
     <hudson.matrix.TextAxis>
       <name>BASE_NAME</name>
       <values>
+        <string>aodh</string>
+        <string>barbican</string>
+        <string>barbican-hsm</string>
+        <string>designate</string>
+        <string>designate-bind</string>
         <string>ceilometer</string>
         <string>ceilometer-agent</string>
         <string>ceph</string>
         <string>ceph-osd</string>
         <string>ceph-mon</string>
         <string>ceph-radosgw</string>
+        <string>ceph-proxy</string>
         <string>cinder</string>
         <string>cinder-backup</string>
         <string>cinder-ceph</string>
         <string>glance</string>
+        <string>hacluster</string>
         <string>heat</string>
         <string>keystone</string>
         <string>lxd</string>
@@ -77,6 +90,7 @@
         <string>rabbitmq-server</string>
         <string>swift-proxy</string>
         <string>swift-storage</string>
+        <string>tempest</string>
       </values>
     </hudson.matrix.TextAxis>
   </axes>
@@ -85,7 +99,7 @@
     <hudson.tasks.Shell>
       <command>#exit 1</command>
     </hudson.tasks.Shell>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -130,14 +144,17 @@
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;UOS_COMBO&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.4"/>
+    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.5"/>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>true</runSequentially>

=== added directory 'deployment/jobs/amulet_smoke_matrix'
=== added file 'deployment/jobs/amulet_smoke_matrix/config.xml'
--- deployment/jobs/amulet_smoke_matrix/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/amulet_smoke_matrix/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,162 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project plugin="matrix-project@1.7.1">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>60</numToKeep>
+        <artifactDaysToKeep>120</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <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>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <matrixOptions>
+        <throttleMatrixBuilds>true</throttleMatrixBuilds>
+        <throttleMatrixConfigurations>true</throttleMatrixConfigurations>
+      </matrixOptions>
+      <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>
+    <hudson.triggers.TimerTrigger>
+      <spec>H 23 * * 4
+H 23 * * 1</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>true</concurrentBuild>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>GIT_BRANCH</name>
+      <values>
+        <string>master</string>
+        <string>stable/16.04</string>
+      </values>
+    </hudson.matrix.TextAxis>
+    <hudson.matrix.TextAxis>
+      <name>BASE_NAME</name>
+      <values>
+        <string>aodh</string>
+        <string>barbican</string>
+        <string>barbican-hsm</string>
+        <string>designate</string>
+        <string>designate-bind</string>
+        <string>ceilometer</string>
+        <string>ceilometer-agent</string>
+        <string>ceph</string>
+        <string>ceph-osd</string>
+        <string>ceph-mon</string>
+        <string>ceph-radosgw</string>
+        <string>ceph-proxy</string>
+        <string>cinder</string>
+        <string>cinder-backup</string>
+        <string>cinder-ceph</string>
+        <string>glance</string>
+        <string>hacluster</string>
+        <string>heat</string>
+        <string>keystone</string>
+        <string>lxd</string>
+        <string>neutron-api</string>
+        <string>neutron-api-odl</string>
+        <string>neutron-gateway</string>
+        <string>neutron-openvswitch</string>
+        <string>nova-cloud-controller</string>
+        <string>nova-compute</string>
+        <string>odl-controller</string>
+        <string>openstack-dashboard</string>
+        <string>openvswitch-odl</string>
+        <string>percona-cluster</string>
+        <string>rabbitmq-server</string>
+        <string>swift-proxy</string>
+        <string>swift-storage</string>
+        <string>tempest</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <combinationFilter>!(GIT_BRANCH==&quot;stable&quot;)</combinationFilter>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#exit 1</command>
+    </hudson.tasks.Shell>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>BASE_NAME=$BASE_NAME
+GIT_BRANCH=$GIT_BRANCH</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>test_charm_amulet_smoke</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </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>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;UOS_COMBO&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.5"/>
+  </buildWrappers>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>true</runSequentially>
+  </executionStrategy>
+</matrix-project>
\ No newline at end of file

=== modified file 'deployment/jobs/charm_lint_matrix/config.xml'
--- deployment/jobs/charm_lint_matrix/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/charm_lint_matrix/config.xml	2016-10-03 16:28:43 +0000
@@ -1,33 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<matrix-project plugin="matrix-project@1.4.1">
+<matrix-project plugin="matrix-project@1.7.1">
   <actions/>
   <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>60</numToKeep>
-    <artifactDaysToKeep>120</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>60</numToKeep>
+        <artifactDaysToKeep>120</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
     <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>3</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <matrixOptions>
         <throttleMatrixBuilds>true</throttleMatrixBuilds>
         <throttleMatrixConfigurations>true</throttleMatrixConfigurations>
       </matrixOptions>
+      <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>slave||lab</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -43,22 +50,29 @@
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable/16.04</string>
+        <string>stable/16.07</string>
       </values>
     </hudson.matrix.TextAxis>
     <hudson.matrix.TextAxis>
       <name>BASE_NAME</name>
       <values>
+        <string>aodh</string>
+        <string>barbican</string>
+        <string>barbican-hsm</string>
+        <string>designate</string>
+        <string>designate-bind</string>
         <string>ceilometer</string>
         <string>ceilometer-agent</string>
         <string>ceph</string>
         <string>ceph-osd</string>
         <string>ceph-mon</string>
         <string>ceph-radosgw</string>
+        <string>ceph-proxy</string>
         <string>cinder</string>
         <string>cinder-backup</string>
         <string>cinder-ceph</string>
         <string>glance</string>
+        <string>hacluster</string>
         <string>heat</string>
         <string>keystone</string>
         <string>lxd</string>
@@ -75,6 +89,7 @@
         <string>rabbitmq-server</string>
         <string>swift-proxy</string>
         <string>swift-storage</string>
+        <string>tempest</string>
       </values>
     </hudson.matrix.TextAxis>
   </axes>
@@ -82,7 +97,7 @@
     <hudson.tasks.Shell>
       <command>#exit 1</command>
     </hudson.tasks.Shell>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -127,14 +142,17 @@
       <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.4"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.6.5">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;UOS_COMBO&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.4"/>
+    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.5"/>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>true</runSequentially>

=== added directory 'deployment/jobs/charm_pusher_aodh_master'
=== added file 'deployment/jobs/charm_pusher_aodh_master/config.xml'
--- deployment/jobs/charm_pusher_aodh_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_aodh_master/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>aodh</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>master</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-aodh</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>aodh</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_aodh_stable'
=== added file 'deployment/jobs/charm_pusher_aodh_stable/config.xml'
--- deployment/jobs/charm_pusher_aodh_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_aodh_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>aodh</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.07</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-aodh</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.07</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>aodh</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_barbican-softhsm_master'
=== added file 'deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml'
--- deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>barbican-softhsm</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>master</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-barbican-softhsm</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>barbican-softhsm</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_barbican-softhsm_stable'
=== added file 'deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml'
--- deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>barbican-softhsm</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.07</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-barbican-softhsm</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.07</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>barbican-softhsm</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_barbican_master'
=== added file 'deployment/jobs/charm_pusher_barbican_master/config.xml'
--- deployment/jobs/charm_pusher_barbican_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_barbican_master/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>barbican</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>master</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-barbican</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>barbican</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_barbican_stable'
=== added file 'deployment/jobs/charm_pusher_barbican_stable/config.xml'
--- deployment/jobs/charm_pusher_barbican_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_barbican_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>barbican</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.07</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-barbican</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.07</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>barbican</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml'
--- deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml'
--- deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceilometer_master/config.xml'
--- deployment/jobs/charm_pusher_ceilometer_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceilometer_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceilometer_stable/config.xml'
--- deployment/jobs/charm_pusher_ceilometer_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceilometer_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph-mon_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-mon_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-mon_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph-mon_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-mon_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-mon_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph-osd_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-osd_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-osd_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph-osd_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-osd_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-osd_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== added directory 'deployment/jobs/charm_pusher_ceph-proxy_master'
=== added file 'deployment/jobs/charm_pusher_ceph-proxy_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-proxy_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_ceph-proxy_master/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>ceph-proxy</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>master</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-ceph-proxy</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>ceph-proxy</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_ceph-proxy_stable'
=== added file 'deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/publish paths.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
+&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <assignedNode>slave</assignedNode>
+  <canRoam>false</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Asset name (charm name).</description>
+          <defaultValue>ceph-proxy</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.07</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CHARM_PUSH_DRY_RUN</name>
+          <description>Optionally take no action, just run for debug purpose.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Optional string to add to the Build Name of the job.</description>
+          <defaultValue/>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>https://github.com/openstack/charm-ceph-proxy</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.07</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <excludedUsers/>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <wipeOutWorkspace>true</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>true</remotePoll>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir>ceph-proxy</relativeTargetDir>
+    <reference/>
+    <gitConfigName/>
+    <gitConfigEmail/>
+    <skipTag>true</skipTag>
+    <scmName/>
+    <useShallowClone>true</useShallowClone>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>H/5 * * * *</spec>
+      <ignorePostCommitHooks>true</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <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 " - Removing checkout @ $OSCI_ROOT if it exists"
+  rm -rf $OSCI_ROOT ||:
+  echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+      </configuredTriggers>
+      <contentType>text/plain</contentType>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs published:
+${FILE,path="cs_refs_published.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>true</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>[e-mail]</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph_master/config.xml'
--- deployment/jobs/charm_pusher_ceph_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_ceph_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_ceph_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_cinder-backup_master/config.xml'
--- deployment/jobs/charm_pusher_cinder-backup_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_cinder-backup_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_cinder-backup_stable/config.xml'
--- deployment/jobs/charm_pusher_cinder-backup_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_cinder-backup_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_cinder-ceph_master/config.xml'
--- deployment/jobs/charm_pusher_cinder-ceph_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_cinder-ceph_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml'
--- deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -20,7 +21,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.04</defaultValue>
+          <defaultValue>stable/16.07</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -46,7 +47,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.04</name>
+        <name>stable/16.07</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>
+            <recipientList/>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToRequester>false</sendToRequester>
+            <sendToDevelopers>false</sendToDevelopers>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
       </configuredTriggers>
       <contentType>text/plain</contentType>
       <defaultSubject>[UOSCI] $DEFAULT_SUBJECT - ${ENV,var="BASE_NAME"} ${ENV,var="GIT_BRANCH"} ${ENV,var="DISPLAY_NAME"}</defaultSubject>
@@ -145,7 +146,7 @@
       <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
       <attachBuildLog>true</attachBuildLog>
-      <saveOutput>true</saveOutput>
+      <saveOutput>false</saveOutput>
       <disabled>false</disabled>
       <replyTo>[e-mail]</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>

=== modified file 'deployment/jobs/charm_pusher_cinder_master/config.xml'
--- deployment/jobs/charm_pusher_cinder_master/config.xml	2016-07-08 20:38:03 +0000
+++ deployment/jobs/charm_pusher_cinder_master/config.xml	2016-10-03 16:28:43 +0000
@@ -4,6 +4,7 @@
 &lt;p&gt;&lt;i&gt;Dynamically Generated Job - Do not edit through the Jenkins Web UI.  You will lose your changes.&lt;/i&gt;&lt;/p&gt;
 &lt;!-- Managed by Jenkins Job Builder --&gt;</description>
   <keepDependencies>false</keepDependencies>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
@@ -109,17 +110,6 @@
     <hudson.plugins.emailext.ExtendedEmailPublisher>
       <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
       <configuredTriggers>
-        <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
-          <email>
-            <recipientList/>
-            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
-            <body>$PROJECT_DEFAULT_CONTENT</body>
-            <sendToRequester>false</sendToRequester>
-            <sendToDevelopers>false</sendToDevelopers>
-            <includeCulprits>false</includeCulprits>
-            <sendToRecipientList>true</sendToRecipientList>
-          </email>
-        </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
             <recipientList/>
@@ -131,6 +121,17 @@
             <sendToRecipientList>true</sendToRecipientList>
           </email>
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
+          <email>