Merge lp:~1chb1n/ubuntu-openstack-ci/secgroup-cleanup into lp:ubuntu-openstack-ci

[Ryan Beisner]

Add secgroup cleanup and make changes for restricted sudo privileges

Juju destroy often leaves secgroups behind, eventually resulting in duplicate secgroup names, causing false failures in OSCI, such as:

https://openstack-ci-reports.ubuntu.com/artifacts/test_charm_pipeline/openstack/charm-swift-storage/397291/1/1199/consoleText.test_charm_amulet_smoke_2186.txt

This is really caused by a couple of bugs in Juju core:

- https://bugs.launchpad.net/juju-core/+bug/1333162
- https://bugs.launchpad.net/juju/+bug/1625624
- https://bugs.launchpad.net/juju/+bug/1570216

[Ryan Beisner (1chb1n)]

Prior to a test job of this branch, slave #12 had a triplicate secgroup:

| 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9 | juju-osci-sv12 | juju group
| 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9 | juju-osci-sv12-0 | juju group
| 32c67cd8-287c-4cf8-88ba-31fe028bffb0 | juju-osci-sv12-1 | juju group

.

The test job subsequently ran into LP1625624 as has been observed:

00:11:02.185 WARNING cannot delete security group "juju-osci-sv12-0". Used by another environment?
00:11:31.360 WARNING cannot delete security group "juju-osci-sv12-1". Used by another environment?

.

But never fear. Our new janitor deleted the secgroups after juju destory 'completed'

00:13:16.988 ====> Deleting undercloud tenant's nova sec groups for osci-sv12 <=======================
00:13:19.712 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | Id | Name | Description |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9 | juju-osci-sv12 | juju group |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.973 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | Id | Name | Description |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9 | juju-osci-sv12-0 | juju group |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.906 32c67cd8-287c-4cf8-88ba-31fe028bffb0
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | Id | Name | Description |
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | 32c67cd8-287c-4cf8-88ba-31fe028bffb0 | juju-osci-sv12-1 | juju group |
00:13:25.654 +--------------------------------------+------------------+-------------+

.

Full test run console @ http://pastebin.ubuntu.com/23477353/.

[lp:~1chb1n/ubuntu-openstack-ci/secgroup-cleanup]

390. By Ryan Beisner on 2016-11-22

Add post-destroy info dump

391. By Ryan Beisner on 2016-11-22

Adjust for limited sudo privileges for the jenkins user

392. By Ryan Beisner on 2016-12-03

Remove shim for hashsum mismatch issue in Juju 1.25.6

 - https://launchpad.net/bugs/1541482

393. By Ryan Beisner on 2016-12-03

Update pushers to address stable charm tool syntax change

 - https://bugs.launchpad.net/charm-test-infra/+bug/1647000

 - https://github.com/juju/charmstore-client/issues/104

 - https://github.com/juju/docs/issues/1555

394. By Ryan Beisner on 2016-12-03

Fix bighammer destroyer juju binary call

395. By Ryan Beisner on 2016-12-09

Update mojo spec runner

396. By Ryan Beisner on 2016-12-09

Bail earlier if mojo operations fail

397. By Ryan Beisner on 2016-12-09

Update jenkins sudoers

398. By Ryan Beisner on 2016-12-09

Update jobs

399. By Ryan Beisner on 2017-01-04

Additional work-around for LP 1647000

400. By Ryan Beisner on 2017-01-05

Update juju upgrade work-around re: LP 1646909

401. By Ryan Beisner on 2017-01-05

Remove work-around for charm publish command change LP1647000

402. By Ryan Beisner on 2017-02-01

Update bundle constrainer and fix lint

[Ryan Beisner (1chb1n)]

OSCI has been running live on this branch since it was forked.

=== added file 'admin/902-reinstall-juju-all-slaves.sh'
--- admin/902-reinstall-juju-all-slaves.sh	1970-01-01 00:00:00 +0000
+++ admin/902-reinstall-juju-all-slaves.sh	2017-02-01 18:04:01 +0000
@@ -0,0 +1,39 @@
+#!/bin/bash -ex
+echo $0
+
+# Purge and reinstall juju and related tools on the master and all jenkins slaves
+apps="osci osci-task osci-lab osci-slave"
+
+# Optionally inject this to clean up and force reinstall
+#sudo apt-get remove juju juju-core juju-1.25 juju-2.0 juju-local juju-mongodb mojo \
+#    juju-deployer python-jujuclient python-juju-deployer python3-juju-deployer \
+#    amulet python-amulet python3-amulet charm charm-tools \
+#    python-theblues python-libcharmstore python-jujubundlelib -y ||:&&\
+
+# NOTE: it is necessary to munge symlinks for now, as the 1.25 ppa packaging is
+# actually intended for Trusty (update-alternatives), and otherwise conflicts
+# badly on Xenial.  https://bugs.launchpad.net/bugs/1646909
+
+cmds="export JUJU_HOME=$HOME/.juju &&\
+sudo apt-get autoremove -y ||:&&\
+sudo add-apt-repository ppa:juju/1.25 -y &&\
+sudo add-apt-repository ppa:juju/1.25-proposed -y &&\
+sudo add-apt-repository ppa:juju/stable -y &&\
+sudo add-apt-repository ppa:juju/proposed -y &&\
+sudo add-apt-repository ppa:mojo-maintainers/ppa -y &&\
+sudo apt-get update -y &&\
+sudo apt-get install juju juju-core mojo charm lxd zfsutils-linux -y &&\
+sudo apt-get install python-juju-deployer python3-juju-deployer &&\  # https://bugs.launchpad.net/bugs/1644922
+sudo usermod -aG mojo jenkins &&\
+sudo ln -fs /usr/lib/juju-1.25.9/bin/juju /usr/bin/juju &&\
+sudo ln -fs /usr/lib/juju-1.25.9/bin/juju /usr/bin/juju-1.25 &&\
+juju version &&\
+juju-1.25 version &&\
+juju-2.0 version &&\
+uname -a"
+
+for app in $apps; do
+  echo "========== ${app} =========="
+  juju run --service $app "$cmds"
+done
+

=== modified file 'deployment/111-osci1-xenial.yaml'
--- deployment/111-osci1-xenial.yaml	2016-08-31 04:59:44 +0000
+++ deployment/111-osci1-xenial.yaml	2017-02-01 18:04:01 +0000
@@ -18,7 +18,7 @@
         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
+        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 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 python3-dev tree
         username: ubuntu
         password: ubuntu
     osci-slave:
@@ -27,7 +27,7 @@
       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
+        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 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 python3-dev tree
         labels: slave
     osci-lab:
       branch: lp:~1chb1n/+junk/jenkins-slave-legacy-mash
@@ -35,7 +35,7 @@
       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
+        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 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 python3-dev tree
         labels: lab
     osci-task:
       branch: lp:~1chb1n/+junk/jenkins-slave-legacy-mash
@@ -43,7 +43,7 @@
       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
+        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 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 python3-dev tree
         labels: task
 
 # TODO - devpi for caching pypi

=== modified file 'deployment/bin/100-jenkins-user.sh'
--- deployment/bin/100-jenkins-user.sh	2016-08-29 18:45:24 +0000
+++ deployment/bin/100-jenkins-user.sh	2017-02-01 18:04:01 +0000
@@ -5,8 +5,6 @@
 
 . $(dirname $0)/../../env-common
 
-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"
@@ -15,15 +13,23 @@
 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 ||\
-    { echo 'adding to ${f_sudoer} on ${unit} and setting 0440'; \
-    sudo echo '${j_sudoer}' | sudo tee -a ${f_sudoer}; \
-    sudo chmod 0440 ${f_sudoer}; } &&\
-    sudo cp ${U_HOME}/.bashrc ${JENKINS_HOME} &&\
+  juju ssh $unit "sudo cp ${U_HOME}/.bashrc ${JENKINS_HOME} &&\
     sudo cp ${U_HOME}/.bashrc ${JENKINS_HOME}/.bash_profile &&\
     sudo chown jenkins:jenkins -R ${JENKINS_HOME}"
-  #  Test sudo ability
-  juju ssh $unit "sudo su - jenkins -c 'sudo id jenkins'"
+
+  export CMD_TMP="echo \"jenkins ALL= NOPASSWD:SETENV:/var/lib/jenkins/tools/bot-control/tools/juju-sym-switch
+jenkins ALL= NOPASSWD:SETENV:/var/lib/jenkins/checkout/*/bot-control/tools/juju-sym-switch
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-ls
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-info
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-start
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-shutdown
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-wait
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/lxc-execute
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/mojo-project-new
+jenkins ALL= NOPASSWD:SETENV:/usr/bin/mojo-project-destroy
+\" > /home/ubuntu/z-jenkins && sudo cp /home/ubuntu/z-jenkins /etc/sudoers.d && sudo chmod 0440 /etc/sudoers.d/z-jenkins && sudo ls -alhtr /etc/sudoers.d"
+
+  juju ssh $unit "$CMD_TMP"
+  juju ssh $unit "sudo visudo -c"
+
 done

=== modified file 'deployment/jobs/_apt_maint_nodes/config.xml'
--- deployment/jobs/_apt_maint_nodes/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/_apt_maint_nodes/config.xml	2017-02-01 18:04:01 +0000
@@ -64,13 +64,14 @@
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>master||slave</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>

=== modified file 'deployment/jobs/_charm_whoami_check/config.xml'
--- deployment/jobs/_charm_whoami_check/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/_charm_whoami_check/config.xml	2017-02-01 18:04:01 +0000
@@ -66,13 +66,14 @@
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>slave||lab||master||task</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>

=== modified file 'deployment/jobs/_juju_bighammer_destroy_this/config.xml'
--- deployment/jobs/_juju_bighammer_destroy_this/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/_juju_bighammer_destroy_this/config.xml	2017-02-01 18:04:01 +0000
@@ -62,7 +62,9 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -79,10 +81,20 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
+      <command>#!/bin/bash -exu
+hostname
+hostname -I
+if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
+  rm -rf $OSCI_ROOT ||:
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+fi
+bzr revno $OSCI_ROOT
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
       <command>#!/bin/bash -e
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 f_fresh_clean_start
-f_delete_neutron_ext_net_ports
 f_check_fail</command>
     </hudson.tasks.Shell>
   </builders>

=== modified file 'deployment/jobs/_juju_bootstrap_this/config.xml'
--- deployment/jobs/_juju_bootstrap_this/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/_juju_bootstrap_this/config.xml	2017-02-01 18:04:01 +0000
@@ -61,7 +61,9 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -78,6 +80,18 @@
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
+      <command>#!/bin/bash -exu
+hostname
+hostname -I
+if [[ ! -f $OSCI_ROOT/job-parts/osci_job_common.sh ]]; then
+  echo &quot; - Removing checkout @ $OSCI_ROOT&quot;
+  rm -rf $OSCI_ROOT ||:
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+fi
+bzr revno $OSCI_ROOT
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
       <command>#!/bin/bash -e
 #${OSCI_ROOT}/job-parts/build_juju_bootstrap.sh
 echo $0

=== modified file 'deployment/jobs/_junk_matrix/config.xml'
--- deployment/jobs/_junk_matrix/config.xml	2016-05-19 21:18:38 +0000
+++ deployment/jobs/_junk_matrix/config.xml	2017-02-01 18:04:01 +0000
@@ -1,60 +1,83 @@
 <?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.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>OSCI_REPO</name>
+          <description></description>
+          <defaultValue>lp:~1chb1n/ubuntu-openstack-ci/1610-updates</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>3</maxConcurrentTotal>
+      <maxConcurrentTotal>8</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>osci-task-0||osci-task-1</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
-  <concurrentBuild>true</concurrentBuild>
+  <concurrentBuild>false</concurrentBuild>
   <axes>
     <hudson.matrix.TextAxis>
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable</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-softhsm</string>
         <string>ceilometer</string>
         <string>ceilometer-agent</string>
         <string>ceph</string>
+        <string>ceph-mon</string>
         <string>ceph-osd</string>
-        <string>ceph-mon</string>
+        <string>ceph-proxy</string>
         <string>ceph-radosgw</string>
         <string>cinder</string>
         <string>cinder-backup</string>
         <string>cinder-ceph</string>
+        <string>designate</string>
+        <string>designate-bind</string>
         <string>glance</string>
+        <string>hacluster</string>
         <string>heat</string>
         <string>keystone</string>
         <string>lxd</string>
@@ -71,15 +94,15 @@
         <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.26">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.32">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -124,16 +147,19 @@
       <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>
+    <runSequentially>false</runSequentially>
   </executionStrategy>
 </matrix-project>
\ No newline at end of file

=== modified file 'deployment/jobs/_no_op/config.xml'
--- deployment/jobs/_no_op/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/_no_op/config.xml	2017-02-01 18:04:01 +0000
@@ -33,12 +33,19 @@
           <description></description>
           <defaultValue></defaultValue>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>OSCI_REPO</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>4</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <maxConcurrentTotal>20</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList">
+        <string>false</string>
+      </categories>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
@@ -47,7 +54,7 @@
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>slave</assignedNode>
+  <assignedNode>task</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -58,21 +65,158 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
 
+function f_tool_refresh_osci() {
+# ubuntu_openstack_ci fresh
+  [[ -z &quot;$OSCI_REPO&quot; ]] &amp;&amp; export OSCI_REPO=&quot;lp:ubuntu-openstack-ci&quot;
+  export OSCI_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/ubuntu-openstack-ci&quot;
+
+  if [[ -d $OSCI_ROOT ]]; then
+    echo &quot; - Removing existing checkout @ $OSCI_ROOT&quot;
+    rm -rf $OSCI_ROOT
+  fi
+  echo &quot; + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT.&quot;
+  mkdir -p $OSCI_ROOT
+  bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo &quot;revno: $(bzr revno $OSCI_ROOT)&quot;
+}
+
+
+function f_tool_refresh_oct() {
+# keep openstack_charm_testing fresh
+  [[ -z &quot;$OPENSTACK_CHARM_TESTING_REPO&quot; ]] &amp;&amp; export OPENSTACK_CHARM_TESTING_REPO=&quot;lp:openstack-charm-testing&quot;
+  export OPENSTACK_CHARM_TESTING_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/openstack-charm-testing&quot;
+
+  if [[ -d $OPENSTACK_CHARM_TESTING_ROOT ]]; then
+    echo &quot; - Removing existing checkout of @ $OPENSTACK_CHARM_TESTING_ROOT&quot;
+    rm -rf $OPENSTACK_CHARM_TESTING_ROOT
+  fi
+  echo &quot; + Creating new lightweight checkout of $OPENSTACK_CHARM_TESTING_REPO @ $OPENSTACK_CHARM_TESTING_ROOT.&quot;
+  mkdir -p $OPENSTACK_CHARM_TESTING_ROOT
+  bzr co --lightweight $OPENSTACK_CHARM_TESTING_REPO $OPENSTACK_CHARM_TESTING_ROOT
+  echo &quot;revno: $(bzr revno $OPENSTACK_CHARM_TESTING_ROOT)&quot;
+}
+
+
+function f_tool_refresh_juju_wait() {
+# keep juju_wait fresh
+  [[ -z &quot;$JUJU_WAIT_REPO&quot; ]] &amp;&amp; export JUJU_WAIT_REPO=&quot;https://git.launchpad.net/juju-wait&quot;
+  [[ -z &quot;$JUJU_WAIT_BRANCH&quot; ]] &amp;&amp; export JUJU_WAIT_BRANCH=&quot;master&quot;
+  export JUJU_WAIT_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/juju-wait&quot;
+  
+  if [[ -d $JUJU_WAIT_ROOT ]]; then
+    echo &quot; - Removing existing dir @ $JUJU_WAIT_ROOT&quot;
+    rm -rf $JUJU_WAIT_ROOT
+  fi
+
+  echo &quot; + Creating new shallow clone of $JUJU_WAIT_REPO @ $JUJU_WAIT_ROOT ($JUJU_WAIT_BRANCH).&quot;
+  mkdir -p $JUJU_WAIT_BRANCH
+  git clone -q --depth=1 $JUJU_WAIT_REPO $JUJU_WAIT_ROOT -b $JUJU_WAIT_BRANCH
+  git -C $JUJU_WAIT_ROOT branch -av
+  git -C $JUJU_WAIT_ROOT remote -v
+}
+
+
+function f_tool_refresh_migration_tools() {
+# Git the migration tools
+  [[ -z &quot;$UOSCI_MIG_TOOLS_REPO&quot; ]] &amp;&amp; export UOSCI_MIG_TOOLS_REPO=&quot;https://github.com/openstack-charmers/migration-tools&quot;
+  [[ -z &quot;$UOSCI_MIG_TOOLS_BRANCH&quot; ]] &amp;&amp; export UOSCI_MIG_TOOLS_BRANCH=&quot;master&quot;
+  export UOSCI_MIG_TOOLS_ROOT=&quot;$HOME/tools/$EXECUTOR_NUMBER/migration-tools&quot;
+  
+  if [[ -d $UOSCI_MIG_TOOLS_ROOT ]]; then
+    echo &quot; - Removing existing dir @ $UOSCI_MIG_TOOLS_ROOT&quot;
+    rm -rf $UOSCI_MIG_TOOLS_ROOT
+  fi
+
+  echo &quot; + Creating new shallow clone of $UOSCI_MIG_TOOLS_REPO @ $UOSCI_MIG_TOOLS_ROOT ($UOSCI_MIG_TOOLS_BRANCH).&quot;
+  mkdir -p $UOSCI_MIG_TOOLS_BRANCH
+  git clone -q --depth=1 $UOSCI_MIG_TOOLS_REPO $UOSCI_MIG_TOOLS_ROOT -b $UOSCI_MIG_TOOLS_BRANCH
+  git -C $UOSCI_MIG_TOOLS_ROOT branch -av
+  git -C $UOSCI_MIG_TOOLS_ROOT remote -v
+}
+
+
+function f_tool_refresh_bot_control() {
+# Git the bot-control repo
+  [[ -z &quot;$UOSCI_BOT_CONTROL_REPO&quot; ]] &amp;&amp; export UOSCI_BOT_CONTROL_REPO=&quot;https://github.com/openstack-charmers/bot-control.git&quot;
+  [[ -z &quot;$UOSCI_BOT_CONTROL_BRANCH&quot; ]] &amp;&amp; export UOSCI_BOT_CONTROL_BRANCH=&quot;master&quot;
+  export UOSCI_BOT_CONTROL_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/bot-control&quot;
+  
+  if [[ -d $UOSCI_BOT_CONTROL_ROOT ]]; then
+    echo &quot; - Removing existing dir @ $UOSCI_BOT_CONTROL_ROOT&quot;
+    rm -rf $UOSCI_BOT_CONTROL_ROOT
+  fi
+
+  echo &quot; + Creating new shallow clone of $UOSCI_BOT_CONTROL_REPO @ $UOSCI_BOT_CONTROL_ROOT ($UOSCI_BOT_CONTROL_BRANCH)&quot;
+  mkdir -p $UOSCI_BOT_CONTROL_BRANCH
+  git clone -q --depth=1 $UOSCI_BOT_CONTROL_REPO $UOSCI_BOT_CONTROL_ROOT -b $UOSCI_BOT_CONTROL_BRANCH
+  git -C $UOSCI_BOT_CONTROL_ROOT branch -av
+  git -C $UOSCI_BOT_CONTROL_ROOT remote -v
+}
+
+
+function f_tool_refresh_release_tools() {
+# Git the release-tools repo
+  [[ -z &quot;$UOSCI_RELEASE_TOOLS_REPO&quot; ]] &amp;&amp; export UOSCI_RELEASE_TOOLS_REPO=&quot;https://github.com/openstack-charmers/release-tools&quot;
+  [[ -z &quot;$UOSCI_RELEASE_TOOLS_BRANCH&quot; ]] &amp;&amp; export UOSCI_RELEASE_TOOLS_BRANCH=&quot;master&quot;
+  export UOSCI_RELEASE_TOOLS_ROOT=&quot;${HOME}/tools/$EXECUTOR_NUMBER/release-tools&quot;
+
+  if [[ -d $UOSCI_RELEASE_TOOLS_ROOT ]]; then
+    echo &quot; - Removing existing dir @ $UOSCI_RELEASE_TOOLS_ROOT&quot;
+    rm -rf $UOSCI_RELEASE_TOOLS_ROOT
+  fi
+
+  echo &quot; + Creating shallow new clone of $UOSCI_RELEASE_TOOLS_REPO @ $UOSCI_RELEASE_TOOLS_ROOT ($UOSCI_RELEASE_TOOLS_BRANCH)&quot;
+  mkdir -p $UOSCI_RELEASE_TOOLS_BRANCH
+  git clone -q --depth=1 $UOSCI_RELEASE_TOOLS_REPO $UOSCI_RELEASE_TOOLS_ROOT -b $UOSCI_RELEASE_TOOLS_BRANCH
+  git -C $UOSCI_RELEASE_TOOLS_ROOT branch -av
+  git -C $UOSCI_RELEASE_TOOLS_ROOT remote -v
+}
+
+
+function f_tools_refresh() {
+  if [[ &quot;${NO_TOOLS_REFRESH^^}&quot; != &quot;TRUE&quot; ]]; then
+    echo &quot;Refreshing checkouts...&quot;
+    f_tool_refresh_osci
+    f_tool_refresh_migration_tools
+    f_tool_refresh_bot_control
+    f_tool_refresh_release_tools
+
+    if [[ &quot;${SKIP_JUJU_LXC^^}&quot; != &quot;TRUE&quot; ]]; then
+      f_tool_refresh_oct
+      f_tool_refresh_juju_wait
+    fi
+
+  else
+    echo &quot; - Not refreshing UOSCI &amp; O-C-T branches due to env var.&quot;
+  fi
+}
+
+f_tools_refresh
+
+
+###############
+
+env | sort
+
+###############
+
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
-
-f_line &quot;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
+f_line &quot;${OSCI_ROOT}/job-parts/osci_job_common.sh&quot;
+
+
+# Not expected to work on multi-executor slaves
+#f_line &quot;Flip-flopping Juju major versions&quot;
+#juju version
+#f_go_juju2
+#juju version
+#f_go_juju1
+#juju version
+
+###############
+
 uname -a
 uptime
-date &gt; $WORKSPACE/foo.txt
-sleep 4</command>
+date &gt; $WORKSPACE/foo.txt</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -93,7 +237,7 @@
     </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>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BASE_NAME&quot;} ${ENV,var=&quot;GIT_BRANCH&quot;} @ ${ENV,var=&quot;NODE_NAME&quot;}:${ENV,var=&quot;EXECUTOR_NUMBER&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
       <runAtStart>true</runAtStart>
       <runAtEnd>true</runAtEnd>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/_tmp_cleanup_all_slaves/config.xml'
--- deployment/jobs/_tmp_cleanup_all_slaves/config.xml	2016-04-08 14:28:16 +0000
+++ deployment/jobs/_tmp_cleanup_all_slaves/config.xml	2017-02-01 18:04:01 +0000
@@ -12,7 +12,7 @@
   <properties>
     <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>
@@ -53,17 +53,20 @@
       <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>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
@@ -87,12 +90,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/amulet_full_matrix/config.xml'
--- deployment/jobs/amulet_full_matrix/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/amulet_full_matrix/config.xml	2017-02-01 18:04:01 +0000
@@ -41,8 +41,7 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H 23 * * 5
-H 23 * * 2</spec>
+      <spec>H 23 * * 5</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>true</concurrentBuild>
@@ -51,7 +50,7 @@
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable/16.07</string>
+        <string>stable/16.10</string>
       </values>
     </hudson.matrix.TextAxis>
     <hudson.matrix.TextAxis>
@@ -59,7 +58,7 @@
       <values>
         <string>aodh</string>
         <string>barbican</string>
-        <string>barbican-hsm</string>
+        <string>barbican-softhsm</string>
         <string>designate</string>
         <string>designate-bind</string>
         <string>ceilometer</string>

=== modified file 'deployment/jobs/amulet_smoke_matrix/config.xml'
--- deployment/jobs/amulet_smoke_matrix/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/amulet_smoke_matrix/config.xml	2017-02-01 18:04:01 +0000
@@ -41,8 +41,7 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H 23 * * 4
-H 23 * * 1</spec>
+      <spec>H 23 * * 4</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>true</concurrentBuild>
@@ -51,7 +50,7 @@
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable/16.04</string>
+        <string>stable/16.10</string>
       </values>
     </hudson.matrix.TextAxis>
     <hudson.matrix.TextAxis>
@@ -59,7 +58,7 @@
       <values>
         <string>aodh</string>
         <string>barbican</string>
-        <string>barbican-hsm</string>
+        <string>barbican-softhsm</string>
         <string>designate</string>
         <string>designate-bind</string>
         <string>ceilometer</string>

=== modified file 'deployment/jobs/charm_lint_matrix/config.xml'
--- deployment/jobs/charm_lint_matrix/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_lint_matrix/config.xml	2017-02-01 18:04:01 +0000
@@ -50,7 +50,7 @@
       <name>GIT_BRANCH</name>
       <values>
         <string>master</string>
-        <string>stable/16.07</string>
+        <string>stable/16.10</string>
       </values>
     </hudson.matrix.TextAxis>
     <hudson.matrix.TextAxis>
@@ -58,7 +58,7 @@
       <values>
         <string>aodh</string>
         <string>barbican</string>
-        <string>barbican-hsm</string>
+        <string>barbican-softhsm</string>
         <string>designate</string>
         <string>designate-bind</string>
         <string>ceilometer</string>

=== modified file 'deployment/jobs/charm_pusher_aodh_master/config.xml'
--- deployment/jobs/charm_pusher_aodh_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_aodh_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_aodh_stable/config.xml'
--- deployment/jobs/charm_pusher_aodh_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_aodh_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml'
--- deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml'
--- deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_barbican_master/config.xml'
--- deployment/jobs/charm_pusher_barbican_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_barbican_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_barbican_stable/config.xml'
--- deployment/jobs/charm_pusher_barbican_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_barbican_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml'
--- deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml'
--- deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceilometer_master/config.xml'
--- deployment/jobs/charm_pusher_ceilometer_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceilometer_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceilometer_stable/config.xml'
--- deployment/jobs/charm_pusher_ceilometer_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceilometer_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== added directory 'deployment/jobs/charm_pusher_ceph-fs_master'
=== added file 'deployment/jobs/charm_pusher_ceph-fs_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-fs_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_ceph-fs_master/config.xml	2017-02-01 18:04:01 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
+  <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-fs</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-fs</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-fs</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/10 * * * *</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_pusher.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]</recipientList>
+      <configuredTriggers>
+        <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</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>false</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_ceph-fs_stable'
=== added file 'deployment/jobs/charm_pusher_ceph-fs_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-fs_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_ceph-fs_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
+  <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-fs</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.10</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-fs</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.10</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-fs</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/10 * * * *</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_pusher.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]</recipientList>
+      <configuredTriggers>
+        <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</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>false</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/charm_pusher_ceph-mon_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-mon_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-mon_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-mon_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-mon_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-mon_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-osd_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-osd_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-osd_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-osd_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-osd_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-osd_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-proxy_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-proxy_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-proxy_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml'
--- deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph_master/config.xml'
--- deployment/jobs/charm_pusher_ceph_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_ceph_stable/config.xml'
--- deployment/jobs/charm_pusher_ceph_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_ceph_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder-backup_master/config.xml'
--- deployment/jobs/charm_pusher_cinder-backup_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder-backup_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder-backup_stable/config.xml'
--- deployment/jobs/charm_pusher_cinder-backup_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder-backup_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder-ceph_master/config.xml'
--- deployment/jobs/charm_pusher_cinder-ceph_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder-ceph_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml'
--- deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder_master/config.xml'
--- deployment/jobs/charm_pusher_cinder_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_cinder_stable/config.xml'
--- deployment/jobs/charm_pusher_cinder_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_cinder_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_designate-bind_master/config.xml'
--- deployment/jobs/charm_pusher_designate-bind_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_designate-bind_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_designate-bind_stable/config.xml'
--- deployment/jobs/charm_pusher_designate-bind_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_designate-bind_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_designate_master/config.xml'
--- deployment/jobs/charm_pusher_designate_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_designate_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_designate_stable/config.xml'
--- deployment/jobs/charm_pusher_designate_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_designate_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_glance_master/config.xml'
--- deployment/jobs/charm_pusher_glance_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_glance_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_glance_stable/config.xml'
--- deployment/jobs/charm_pusher_glance_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_glance_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_hacluster_master/config.xml'
--- deployment/jobs/charm_pusher_hacluster_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_hacluster_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_hacluster_stable/config.xml'
--- deployment/jobs/charm_pusher_hacluster_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_hacluster_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_heat_master/config.xml'
--- deployment/jobs/charm_pusher_heat_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_heat_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_heat_stable/config.xml'
--- deployment/jobs/charm_pusher_heat_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_heat_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_keystone_master/config.xml'
--- deployment/jobs/charm_pusher_keystone_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_keystone_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_keystone_stable/config.xml'
--- deployment/jobs/charm_pusher_keystone_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_keystone_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_lxd_master/config.xml'
--- deployment/jobs/charm_pusher_lxd_master/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_lxd_master/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== modified file 'deployment/jobs/charm_pusher_lxd_stable/config.xml'
--- deployment/jobs/charm_pusher_lxd_stable/config.xml	2016-09-21 19:36:25 +0000
+++ deployment/jobs/charm_pusher_lxd_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -1,10 +1,9 @@
 <?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;
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
@@ -21,7 +20,7 @@
         <hudson.model.StringParameterDefinition>
           <name>GIT_BRANCH</name>
           <description>Git branch.  Generally master or stable/nn.nn.</description>
-          <defaultValue>stable/16.07</defaultValue>
+          <defaultValue>stable/16.10</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>CHARM_PUSH_DRY_RUN</name>
@@ -47,7 +46,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>stable/16.07</name>
+        <name>stable/16.10</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
@@ -76,7 +75,7 @@
   </scm>
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
-      <spec>H/5 * * * *</spec>
+      <spec>H/10 * * * *</spec>
       <ignorePostCommitHooks>true</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
@@ -95,7 +94,7 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_charm_push_and_publish.sh
+${OSCI_ROOT}/job-parts/build_charm_pusher.sh
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -108,19 +107,8 @@
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
     <hudson.plugins.emailext.ExtendedEmailPublisher>
-      <recipientList>[e-mail], [e-mail], [e-mail]</recipientList>
+      <recipientList>[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/>
@@ -134,21 +122,21 @@
         </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>
+      <defaultSubject>[UOSCI] $DEFAULT_SUBJECT</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"}
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
 </defaultContent>
-      <attachmentsPattern>cs_refs_published.txt</attachmentsPattern>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
       <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
-      <attachBuildLog>true</attachBuildLog>
+      <attachBuildLog>false</attachBuildLog>
       <saveOutput>false</saveOutput>
       <disabled>false</disabled>
-      <replyTo>[e-mail]</replyTo>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
     </hudson.plugins.emailext.ExtendedEmailPublisher>
   </publishers>
   <buildWrappers/>

=== added directory 'deployment/jobs/charm_pusher_manila-generic_master'
=== added file 'deployment/jobs/charm_pusher_manila-generic_master/config.xml'
--- deployment/jobs/charm_pusher_manila-generic_master/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_manila-generic_master/config.xml	2017-02-01 18:04:01 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
+  <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>manila-generic</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-manila-generic</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>manila-generic</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/10 * * * *</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_pusher.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]</recipientList>
+      <configuredTriggers>
+        <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</defaultSubject>
+      <defaultContent>$DEFAULT_SUBJECT
+${ENV,var="BASE_NAME"} ${ENV,var="DISPLAY_NAME"}
+${GIT_URL} (${GIT_BRANCH})
+${GIT_COMMIT}
+
+Charm store refs pushed and released:
+${FILE,path="cs_refs_released.txt"}
+</defaultContent>
+      <attachmentsPattern>cs_refs_released.txt</attachmentsPattern>
+      <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript>
+      <attachBuildLog>false</attachBuildLog>
+      <saveOutput>false</saveOutput>
+      <disabled>false</disabled>
+      <replyTo>$DEFAULT_REPLYTO</replyTo>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_pusher_manila-generic_stable'
=== added file 'deployment/jobs/charm_pusher_manila-generic_stable/config.xml'
--- deployment/jobs/charm_pusher_manila-generic_stable/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_pusher_manila-generic_stable/config.xml	2017-02-01 18:04:01 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description>&lt;p&gt;Watch for git commits and kick off charmstore charm upload/release 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>
+  <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>manila-generic</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GIT_BRANCH</name>
+          <description>Git branch.  Generally master or stable/nn.nn.</description>
+          <defaultValue>stable/16.10</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-manila-generic</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>stable/16.10</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>manila-generic</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/10 * * * *</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_pusher.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]</recipientList>
+      <configuredTriggers>
+        <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>