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

[Ryan Beisner]

update jobs

[Ryan Beisner (1chb1n)]

ok go

review: Approve

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

4. By Ryan Beisner on 2014-10-02

update jobs

=== added directory 'deployment/jobs/charm_amulet_test'
=== added file 'deployment/jobs/charm_amulet_test/config.xml'
--- deployment/jobs/charm_amulet_test/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_amulet_test/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,189 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Execs amulet tests, if they exist.&#xd;
+* Use a trigger to hit this job with parameters.&#xd;
+* Not intended to be run manually.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>180</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>The charm or project&apos;s real name (ie.  keystone).</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Affects build description.</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BRANCH</name>
+          <description>LP: or FQ branch string</description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>4</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_workspace_cleanup</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_system_tools_refresh</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+# Make sure node has no juju environment is already bootstrapped on node
+
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
+echo $juju_ok
+
+if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
+  echo &quot;Juju environment is clear on ${NODE_NAME}, proceeding.&quot;
+else
+  echo &quot;An environment already exists on ${NODE_NAME}!&quot;
+  #touch $WORKSPACE/fyi.enviro-pre-check.failed
+  . $JENKINS_HOME/novarc
+  nova list &amp;&gt; $WORKSPACE/novalist-asfound.$BUILD_NUMBER
+  juju stat &amp;&gt; $WORKSPACE/jujustat-asfound.yaml.$BUILD_NUMBER
+  # Tear down
+  echo &quot;Attempting juju enviro destroy of ${THIS_ENV} on ${NODE_NAME}...&quot;
+  THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+  juju destroy-environment -y $THIS_ENV
+  #ls -alh $WORKSPACE
+  #exit 1
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+
+env | sort 2&gt;&amp;1 | tee $WORKSPACE/env.$BUILD_NUMBER
+
+# Make sure expected env vars exist
+[[ -z &quot;$BASE_NAME&quot; ]] || [[ -z &quot;$BRANCH&quot; ]] &amp;&amp; { echo &quot;No BRANCH and/or BASE_NAME env vars.&quot;; exit 1; }
+
+mkdir -pv $JENKINS_HOME/checkout || true
+
+CO_DIR=$JENKINS_HOME/checkout/$BASE_NAME
+MAKEFILE=$CO_DIR/Makefile
+
+echo $CO_DIR
+echo $MAKEFILE
+
+if [[ -d $CO_DIR ]]; then
+  echo &quot;Removing existing checkout of $BRANCH @ $CO_DIR&quot;
+  rm -rf $CO_DIR
+fi
+
+echo &quot;Creating new checkout of $BRANCH @ $CO_DIR.&quot;
+bzr co --lightweight $BRANCH $CO_DIR
+
+[[ ! -f $MAKEFILE ]] &amp;&amp; { echo &quot;No Makefile found.&quot;; exit 1; }
+
+echo &quot;Gathering info about branch...&quot;
+cd $CO_DIR
+cp -fv Makefile $WORKSPACE/Makefile.$BUILD_NUMBER
+bzr revno 2&gt;&amp;1 | tee $WORKSPACE/branch-info.$BUILD_NUMBER
+bzr info 2&gt;&amp;1 | tee -a $WORKSPACE/branch-info.$BUILD_NUMBER
+
+echo &quot;Checking for amulet tests in Makefile...&quot;
+
+has_amulet=&quot;$(grep &quot;@juju test&quot; $MAKEFILE || true)&quot;
+
+if [[ -z $has_amulet ]]; then
+  echo &quot;No amulet test detected in Makefile.&quot;
+  touch $WORKSPACE/amulet-test.missing
+  exit 1
+fi
+
+make test 2&gt;&amp;1 | tee $WORKSPACE/make-test.$BUILD_NUMBER
+if [[ &quot;${PIPESTATUS[0]}&quot; != &quot;0&quot; ]]; then
+  echo &quot;Amulet test failed.&quot;
+  touch $WORKSPACE/make-test.failed
+fi
+
+
+# Tear down
+THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+juju destroy-environment -y $THIS_ENV || true
+ls -alh $WORKSPACE
+
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.failed* ]]; then
+  exit 1
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+# Make sure we leave with no juju environment
+
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
+echo $juju_ok
+
+if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
+  echo &quot;Juju environment is clear on ${NODE_NAME}.&quot;
+else
+  echo &quot;An unexpected environment exists on ${NODE_NAME}!&quot;
+  touch $WORKSPACE/fyi.enviro-post-check.failed
+  . $JENKINS_HOME/novarc
+  nova list &amp;&gt; $WORKSPACE/novalist.$BUILD_NUMBER
+  juju stat &amp;&gt; $WORKSPACE/jujustat.yaml.$BUILD_NUMBER
+  # Tear down
+  echo &quot;Attempting juju enviro destroy of ${THIS_ENV} on ${NODE_NAME}...&quot;
+  THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+  juju destroy-environment -y $THIS_ENV
+fi
+
+# Check for failures
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.failed* ]]; then
+  exit 1
+fi
+
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.missing* ]]; then
+  exit 1
+fi</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_lint_check'
=== added file 'deployment/jobs/charm_lint_check/config.xml'
--- deployment/jobs/charm_lint_check/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_lint_check/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Execs make lint&#xd;
+* Use a trigger to hit this job with parameters.&#xd;
+* Not intended to be run manually.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>180</daysToKeep>
+    <numToKeep>256</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>The charm or project&apos;s real name (ie.  keystone).</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Affects build description.</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BRANCH</name>
+          <description>LP: or FQ branch string</description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_workspace_cleanup</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_system_tools_refresh</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+
+env | sort 2&gt;&amp;1 | tee $WORKSPACE/env.$BUILD_NUMBER
+
+# Make sure expected env vars exist
+[[ -z &quot;$BASE_NAME&quot; ]] || [[ -z &quot;$BRANCH&quot; ]] &amp;&amp; { echo &quot;No BRANCH and/or BASE_NAME env vars.&quot;; exit 1; }
+
+mkdir -pv $JENKINS_HOME/checkout || true
+
+CO_DIR=$JENKINS_HOME/checkout/$BASE_NAME
+MAKEFILE=$CO_DIR/Makefile
+
+echo $CO_DIR
+echo $MAKEFILE
+
+if [[ -d $CO_DIR ]]; then
+  echo &quot;Removing existing checkout of $BRANCH @ $CO_DIR&quot;
+  rm -rf $CO_DIR
+fi
+
+echo &quot;Creating new checkout @ $CO_DIR.&quot;
+bzr co --lightweight $BRANCH $CO_DIR
+
+[[ ! -f $MAKEFILE ]] &amp;&amp; { echo &quot;No Makefile found.&quot;; exit 1; }
+
+echo &quot;Gathering info about branch...&quot;
+cd $CO_DIR
+cp -fv Makefile $WORKSPACE/Makefile.$BUILD_NUMBER
+bzr revno 2&gt;&amp;1 | tee $WORKSPACE/branch-info.$BUILD_NUMBER
+bzr info 2&gt;&amp;1 | tee -a $WORKSPACE/branch-info.$BUILD_NUMBER
+
+echo &quot;Checking lint...&quot;
+set -x
+pwd
+make lint 2&gt;&amp;1 | tee $WORKSPACE/make-lint.$BUILD_NUMBER
+if [[ &quot;${PIPESTATUS[0]}&quot; != &quot;0&quot; ]]; then
+  echo &quot;Lint check failed.&quot;
+  touch $WORKSPACE/make-lint.failed
+  exit 1
+fi
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.tasks.Mailer plugin="mailer@1.11">
+      <recipients>[e-mail]</recipients>
+      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+      <sendToIndividuals>false</sendToIndividuals>
+    </hudson.tasks.Mailer>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/charm_unit_test'
=== added file 'deployment/jobs/charm_unit_test/config.xml'
--- deployment/jobs/charm_unit_test/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/charm_unit_test/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,205 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Execs amulet tests, if they exist.&#xd;
+* Use a trigger to hit this job with parameters.&#xd;
+* Not intended to be run manually.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>180</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>BASE_NAME</name>
+          <description>Set to charm name for branch dir.</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>DISPLAY_NAME</name>
+          <description>Affects build description.</description>
+          <defaultValue>manual</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BRANCH</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_workspace_cleanup</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.plugins.templateproject.ProxyBuilder plugin="template-project@1.4.2">
+      <projectName>_system_tools_refresh</projectName>
+    </hudson.plugins.templateproject.ProxyBuilder>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+# Make sure node has no juju environment already bootstrapped on node
+
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
+echo $juju_ok
+
+if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
+  echo &quot;Juju environment is clear on ${NODE_NAME}, proceeding.&quot;
+else
+  echo &quot;An environment already exists on ${NODE_NAME}!&quot;
+  #touch $WORKSPACE/fyi.enviro-pre-check.failed
+  . $JENKINS_HOME/novarc
+  nova list &amp;&gt; $WORKSPACE/novalist-asfound.$BUILD_NUMBER
+  juju stat &amp;&gt; $WORKSPACE/jujustat-asfound.yaml.$BUILD_NUMBER
+  # Tear down
+  echo &quot;Attempting juju enviro destroy of ${THIS_ENV} on ${NODE_NAME}...&quot;
+  THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+  juju destroy-environment -y $THIS_ENV
+  #ls -alh $WORKSPACE
+  #exit 1
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+
+env | sort 2&gt;&amp;1 | tee $WORKSPACE/env.$BUILD_NUMBER
+
+# Make sure expected env vars exist
+[[ -z &quot;$BASE_NAME&quot; ]] || [[ -z &quot;$BRANCH&quot; ]] &amp;&amp; { echo &quot;No BRANCH and/or BASE_NAME env vars.&quot;; exit 1; }
+
+mkdir -pv $JENKINS_HOME/checkout || true
+
+CO_DIR=$JENKINS_HOME/checkout/$BASE_NAME
+MAKEFILE=$CO_DIR/Makefile
+
+echo $CO_DIR
+echo $MAKEFILE
+
+if [[ -d $CO_DIR ]]; then
+  echo &quot;Removing existing checkout of $BRANCH @ $CO_DIR&quot;
+  rm -rf $CO_DIR
+fi
+
+echo &quot;Creating new checkout of $BRANCH @ $CO_DIR.&quot;
+bzr co --lightweight $BRANCH $CO_DIR
+
+[[ ! -f $MAKEFILE ]] &amp;&amp; { echo &quot;No Makefile found.&quot;; exit 1; }
+
+echo &quot;Gathering info about branch...&quot;
+cd $CO_DIR
+cp -fv Makefile $WORKSPACE/Makefile.$BUILD_NUMBER
+bzr revno 2&gt;&amp;1 | tee $WORKSPACE/branch-info.$BUILD_NUMBER
+bzr info 2&gt;&amp;1 | tee -a $WORKSPACE/branch-info.$BUILD_NUMBER
+
+echo &quot;Checking for unit tests in Makefile...&quot;
+
+nose_in_unit_test=&quot;$(grep &quot;unit_test:&quot; $MAKEFILE || true)&quot;
+nose_in_test=&quot;$(grep &quot;nosetest&quot; $MAKEFILE || true)&quot;
+echo &quot;niut: ${nose_in_unit_test}(end)&quot;
+echo &quot;nit: ${nose_in_test}(end)&quot;
+
+if [[ -z &quot;$nose_in_unit_test&quot; ]] &amp;&amp; [[ -z &quot;$nose_in_test&quot; ]]; then
+  echo &quot;No unit test detected in Makefile.&quot;
+  touch $WORKSPACE/unit-test.missing
+  exit 1
+fi
+
+if [[ -n &quot;$nose_in_unit_test&quot; ]]; then
+  echo &quot;Trying make unit_test...&quot;
+  make unit_test 2&gt;&amp;1 | tee $WORKSPACE/unit-test.$BUILD_NUMBER
+elif [[ -n &quot;$nose_in_test&quot; ]]; then
+  echo &quot;Trying make test...&quot;
+  make test 2&gt;&amp;1 | tee $WORKSPACE/unit-test.$BUILD_NUMBER
+fi
+
+if [[ &quot;${PIPESTATUS[0]}&quot; != &quot;0&quot; ]]; then
+  echo &quot;Unit test failed.&quot;
+  touch $WORKSPACE/unit-test.failed
+fi
+
+
+# Tear down
+THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+juju destroy-environment -y $THIS_ENV || true
+ls -alh $WORKSPACE
+
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.failed* ]]; then
+  exit 1
+fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+# Make sure we leave with no juju environment
+
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
+echo $juju_ok
+
+if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
+  echo &quot;Juju environment is clear on ${NODE_NAME}.&quot;
+else
+  echo &quot;An unexpected environment exists on ${NODE_NAME}!&quot;
+  touch $WORKSPACE/fyi.enviro-post-check.failed
+  . $JENKINS_HOME/novarc
+  nova list &amp;&gt; $WORKSPACE/novalist.$BUILD_NUMBER
+  juju stat &amp;&gt; $WORKSPACE/jujustat.yaml.$BUILD_NUMBER
+  # Tear down
+  echo &quot;Attempting juju enviro destroy of ${THIS_ENV} on ${NODE_NAME}...&quot;
+  THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
+  juju destroy-environment -y $THIS_ENV
+fi
+
+# Check for failures
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.failed* ]]; then
+  exit 1
+fi
+
+if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.missing* ]]; then
+  exit 1
+fi</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*, logs/*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
+      <regexp>No unit test detected in Makefile</regexp>
+      <regexpForFailed></regexpForFailed>
+      <description>NO UNIT</description>
+      <setForMatrix>false</setForMatrix>
+    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/deploy_with_deployer/config.xml'
--- deployment/jobs/deploy_with_deployer/config.xml	2014-10-02 15:18:00 +0000
+++ deployment/jobs/deploy_with_deployer/config.xml	2014-10-02 16:09:09 +0000
@@ -19,7 +19,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>4</maxConcurrentTotal>
+      <maxConcurrentTotal>3</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -51,14 +51,14 @@
     </hudson.plugins.copyartifact.CopyArtifact>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
-# build description
-echo &quot;&quot; &gt; $WORKSPACE/b_d
-
-# Gather package info
-${OSCI_ROOT}/osci/populate/get-pkg-info.sh || true
-
-# Make sure node has no juju environment is already bootstrapped on node
-juju_ok=&quot;$(${OSCI_ROOT}/osci/populate/juju-deploy-ok.sh || true)&quot;
+# Prep for deploy
+
+# Gather node info and package info
+env | sort | tee $WORKSPACE/env.$BUILD_NUMBER
+${OSCI_ROOT}/populate/get-pkg-info.sh || true
+
+# Make sure node has no juju environment already bootstrapped on node
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
 echo $juju_ok
 
 if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
@@ -68,11 +68,12 @@
   set -x
   . $JENKINS_HOME/novarc
   nova list &amp;&gt; $WORKSPACE/novalist-asfound.$BUILD_NUMBER || true
-  juju stat &amp;&gt; $WORKSPACE/jujustat-asfound.yaml.$BUILD_NUMBER || true
+  juju stat &amp;&gt; $WORKSPACE/jujustat-asfound.$BUILD_NUMBER || true
   # Tear down
   echo &quot;Attempting juju enviro destroy of ${THIS_ENV} on ${NODE_NAME}...&quot;
   THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
   juju destroy-environment -y $THIS_ENV
+  sleep 20
 fi
 </command>
     </hudson.tasks.Shell>
@@ -80,8 +81,8 @@
       <command>#!/bin/bash -e
 
 # Deploy new openstack on openstack environment (tempstack)
-env | sort 2&gt;&amp;1 | tee $WORKSPACE/env.$BUILD_NUMBER
 
+# Handle deployer bundle file upload
 if [[ &quot;$CHARM_SET&quot; == &quot;custom-other.yaml&quot; ]] &amp;&amp; [[ -f custom-other.yaml ]]; then
   echo &quot;Using custom-other deployer bundle yaml file...&quot;
   BUNDLE_FILE=$WORKSPACE/$CHARM_SET
@@ -92,18 +93,19 @@
 fi
 
 INST_SOURCE=&quot;&quot;
-[[ &quot;$INSTALLATION_SOURCE&quot; != &quot;default&quot; ]] &amp;&amp; INST_SOURCE=&quot;-${INSTALLATION_SOURCE}&quot; || echo &quot;FYI default source&quot;
-cd $OPENSTACK_CHARM_TESTING_ROOT
+[[ &quot;$INSTALLATION_SOURCE&quot; != &quot;default&quot; ]] &amp;&amp; INST_SOURCE=&quot;-${INSTALLATION_SOURCE}&quot;
 
 set -x
 (cd $OPENSTACK_CHARM_TESTING_ROOT &amp;&amp;\
-juju-deployer --bootstrap -c ${BUNDLE_FILE} -d ${UBUNTU_RELEASE}-${OPENSTACK_RELEASE}${INST_SOURCE}) 2&gt;&amp;1 | tee $WORKSPACE/jujudeployer.$BUILD_NUMBER
+juju-deployer --bootstrap -c ${BUNDLE_FILE} -d ${UBUNTU_RELEASE}-${OPENSTACK_RELEASE}${INST_SOURCE}) \
+  2&gt;&amp;1 | tee $WORKSPACE/deployer.$BUILD_NUMBER
 sleep 20</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
+# Confirm deployment, configure it, run tempest smoke
 
-juju_ok=&quot;$(${OSCI_ROOT}/osci/populate/juju-deploy-ok.sh || true)&quot;
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
 echo $juju_ok
 
 if [[ &quot;$juju_ok&quot; == *DEPLOYED:* ]]; then
@@ -113,10 +115,9 @@
   # Configure the deployed tempstack
   . $OPENSTACK_CHARM_TESTING_ROOT/novarc
   echo &quot;Calling tempstack configure to tweak network, add test keys...&quot;
-  ${OSCI_ROOT}/osci/populate/tempstack-configure.sh 2&gt;&amp;1 | tee $WORKSPACE/tempstack-configure.$BUILD_NUMBER || true
+  ${OSCI_ROOT}/populate/tempstack-configure.sh 2&gt;&amp;1 | tee $WORKSPACE/tempstack-configure.$BUILD_NUMBER || true
 
   if [[ -n &quot;$(grep testkey.pem $WORKSPACE/tempstack-configure.$BUILD_NUMBER || true)&quot; ]]; then
-    echo &quot;Tempstack configure succeeded.&quot;
     touch $WORKSPACE/fyi.tempstack-configure.ok
   else
     echo &quot;Tempstack configure failed.&quot;
@@ -135,40 +136,50 @@
     touch $WORKSPACE/fyi.configure.bad
   fi
 
-  # Kick off tempest
-  (cd $OPENSTACK_CHARM_TESTING_ROOT/tempest &amp;&amp; ./run_tempest.sh -N --smoke) 2&gt;&amp;1 | tee $WORKSPACE/tempest.$BUILD_NUMBER
-
-  if [[ -n &quot;$(grep &apos;failures=&apos; $WORKSPACE/tempest.$BUILD_NUMBER)&quot; ]]; then
-    echo &quot;One or more tempest smoke tests failed.&quot;
-    touch $WORKSPACE/fyi.tempest-smoke.bad
+  if [[ -n &quot;$(ls $WORKSPACE -1 | egrep &apos;.failed|.bad&apos;)&quot; ]]; then
+    echo &quot;Skipping tempest, one or more preceding steps are failed or bad.&quot;
+    touch $WORKSPACE/fyi.tempest.skipped
   else
-    echo &quot;All tempest smoke tests passed!&quot;
-    touch $WORKSPACE/fyi.tempest-smoke.ok
+    # Kick off tempest
+    (cd $OPENSTACK_CHARM_TESTING_ROOT/tempest &amp;&amp; ./run_tempest.sh -N --smoke) 2&gt;&amp;1 |\
+      tee $WORKSPACE/tempest.$BUILD_NUMBER
+    if [[ -n &quot;$(grep &apos;failures=&apos; $WORKSPACE/tempest.$BUILD_NUMBER)&quot; ]]; then
+      echo &quot;One or more tempest smoke tests failed.&quot;
+      touch $WORKSPACE/fyi.tempest.bad
+    else
+      echo &quot;All tempest smoke tests passed!&quot;
+      touch $WORKSPACE/fyi.tempest.ok
+    fi
   fi
-
 else
   echo &quot;Juju deployment failed.&quot;
   echo &quot;Skipping tempest.&quot;
-  touch $WORKSPACE/fyi.jujudeployer.failed
+  touch $WORKSPACE/fyi.tempest.skipped
+  touch $WORKSPACE/fyi.deploy.failed
 fi
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -e
+# Collect info &amp; tear down environment
 
 # Collect juju stat and logs
 echo &quot;Collecting juju status and unit logs...&quot;
 . $JENKINS_HOME/novarc
-${OSCI_ROOT}/osci/populate/pull_juju_logs.py || true
-${OSCI_ROOT}/osci/populate/collect-charm-revno-info.sh || true
+${OSCI_ROOT}/populate/pull_juju_logs.py || true
+${OSCI_ROOT}/populate/collect-charm-revno-info.sh || true
 nova list &amp;&gt; $WORKSPACE/novalist.$BUILD_NUMBER || true
-juju stat &amp;&gt; $WORKSPACE/jujustat.yaml.$BUILD_NUMBER || true
+juju stat &amp;&gt; $WORKSPACE/jujustat.$BUILD_NUMBER || true
 
-# Combine b_d with &quot;fyi touch files&quot; list and echo for build description regex
+# Build description, combine b_d with fyi. list and echo for regex
 cd $WORKSPACE
 ls fyi.* -1 | sed &apos;s/fyi.//&apos; &gt;&gt; b_d || true
 b_d=&quot;$(cat $WORKSPACE/b_d | tr &apos;\n&apos; &apos; &apos; || true)&quot;
 echo &quot;_:${b_d}&quot;
 
-# Tear down
+# Tear down environment
 THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)
-juju destroy-environment -y $THIS_ENV
+juju destroy-environment -y $THIS_ENV || true
 ls -alh $WORKSPACE
 
 if [[ &quot;$(ls $WORKSPACE -1)&quot; == *.failed* ]]; then

=== modified file 'deployment/jobs/manual_deploy_single_charm/config.xml'
--- deployment/jobs/manual_deploy_single_charm/config.xml	2014-10-02 15:18:00 +0000
+++ deployment/jobs/manual_deploy_single_charm/config.xml	2014-10-02 16:09:09 +0000
@@ -107,7 +107,7 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
 # Make sure node has no juju environment is already bootstrapped on node
-juju_ok=&quot;$(${OSCI_ROOT}/osci/populate/juju-deploy-ok.sh || true)&quot;
+juju_ok=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
 echo $juju_ok
 
 if [[ &quot;$juju_ok&quot; == *CLEAR:* ]]; then
@@ -133,14 +133,14 @@
 juju deploy $THIS_CHARM
 
 # Wait and check
-ready=&quot;$(${OSCI_ROOT}/osci/populate/juju-deploy-ok.sh || true)&quot;
+ready=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
 tries=0
 while [[ &quot;$ready&quot; != *DEPLOYED:* ]] &amp;&amp; [ $tries -le 30 ]
 do
   echo &quot;Waiting for environment state to become started/ACTIVE...&quot;
   echo &quot;Environment state: ${ready}&quot;
   sleep 10
-  ready=&quot;$(${OSCI_ROOT}/osci/populate/juju-deploy-ok.sh || true)&quot;
+  ready=&quot;$(${OSCI_ROOT}/populate/juju-deploy-ok.sh || true)&quot;
   tries=$(( $tries + 1 ))
 done
 
@@ -159,7 +159,7 @@
 . $JENKINS_HOME/novarc
 nova list &amp;&gt; $WORKSPACE/novalist.$BUILD_NUMBER
 juju stat &amp;&gt; $WORKSPACE/jujustat.yaml.$BUILD_NUMBER
-${OSCI_ROOT}/osci/populate/pull_juju_logs.py
+${OSCI_ROOT}/populate/pull_juju_logs.py
 
 echo &quot;Tearing down environment...&quot;
 THIS_ENV=$(juju stat | awk &apos;/environment/ { print $2 }&apos;)

=== added directory 'deployment/jobs/scheduled_trigger_deploy'
=== added file 'deployment/jobs/scheduled_trigger_deploy/config.xml'
--- deployment/jobs/scheduled_trigger_deploy/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_deploy/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Triggers deployments for all branches via branch_scanner job&#xd;
+* Weekly on Sunday</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>90</daysToKeep>
+    <numToKeep>90</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>25 2 * * 0</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>TRIGGER_FINGER=FORCE_DEPLOY_ONLY
+SCHEDULED_TRIGGER=TRUE</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_branch_scanner</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_lint'
=== added file 'deployment/jobs/scheduled_trigger_lint/config.xml'
--- deployment/jobs/scheduled_trigger_lint/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_lint/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Triggers lint check for all branches via branch_scanner job&#xd;
+* Weekly on Sunday</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>90</daysToKeep>
+    <numToKeep>90</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>10 11 * * 0</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>TRIGGER_FINGER=FORCE_LINT_ONLY
+SCHEDULED_TRIGGER=TRUE</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_branch_scanner</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_single_charm'
=== added file 'deployment/jobs/scheduled_trigger_single_charm/config.xml'
--- deployment/jobs/scheduled_trigger_single_charm/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_single_charm/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Triggers juju deployment of a single charm to ALL jenkins nodes (master + all slaves).&#xd;
+* Useful as a health indicator for each node&apos;s juju environment and configuration.&#xd;
+* Runs daily.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>90</daysToKeep>
+    <numToKeep>90</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>10 0 * * *</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>SCHEDULED_TRIGGER=TRUE</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>manual_deploy_single_charm</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.1">
+      <includeFailedBuilds>true</includeFailedBuilds>
+    </hudson.tasks.test.AggregatedTestResultPublisher>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_unit'
=== added file 'deployment/jobs/scheduled_trigger_unit/config.xml'
--- deployment/jobs/scheduled_trigger_unit/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_unit/config.xml	2014-10-02 16:09:09 +0000
@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>* Triggers unit tests for all branches via branch_scanner job&#xd;
+* Weekly on Sunday</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>90</daysToKeep>
+    <numToKeep>90</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>05 11 * * 0</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>TRIGGER_FINGER=FORCE_UNIT_ONLY
+SCHEDULED_TRIGGER=TRUE</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_branch_scanner</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/trigger_by_branch_scanner/config.xml'
--- deployment/jobs/trigger_by_branch_scanner/config.xml	2014-10-02 15:18:00 +0000
+++ deployment/jobs/trigger_by_branch_scanner/config.xml	2014-10-02 16:09:09 +0000
@@ -5,7 +5,7 @@
 * Can be manually triggered with various parameters for manual test chain or deployment kick off.&#xd;
 * Deployment jobs trigger positive if ANY branch defined in mappings.yaml has a change.&#xd;
 * Amulet &amp; lint jobs trigger positive if specific branches defined in mappings.yaml have a change.&#xd;
-* Calls external python routine, reading branch list from ubuntu-openstack-ci/osci/populate/mappings.yaml.&#xd;
+* Calls external python routine, reading branch list from ubuntu-openstack-ci/populate/mappings.yaml.&#xd;
 * Creates properties files for job triggers.&#xd;
 * Additionally, if there are branch revisions, or new branches, a flat file is created at $HOME/state/branch-state.changed, with 1 LP:branch per line, can be parsed by jobs if necessary.</description>
   <logRotator class="hudson.tasks.LogRotator">
@@ -56,10 +56,8 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.3">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
@@ -83,7 +81,7 @@
       <command>#!/bin/bash -e
 env | sort &gt; env
 rm -fv $WORKSPACE/*
-cd $OSCI_ROOT/osci/
+cd $OSCI_ROOT
 
 case &quot;$TRIGGER_FINGER&quot; in
   AUTO)