Merge lp:~psivaa/ubiquity/update-ubiquity-tests into lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing

[Para Siva]

Update the local ubiquity tests for ever test run.

This is to update the ubiquity tests every time the tests get executed.

[Paul Larson (pwlars)]

This seems to work fine for me as long as we make sure to pull the initial version of this branch as the jenkins user and not as root. I've made that correction in the charm, so we're good to go.

review: Approve

=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml'
--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml	2013-12-20 08:15:37 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml	2015-02-19 13:39:18 +0000
@@ -30,6 +30,19 @@
   <triggers class="vector"/>
   <concurrentBuild>false</concurrentBuild>
   <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+BRANCH=&quot;lp:ubiquity&quot;
+BZRDIR=`echo &quot;$BRANCH&quot; | awk -F: &apos;{ print $(NF) }&apos;`
+if [ -d $JENKINS_HOME/$BZRDIR ]; then
+     cd $JENKINS_HOME/$BZRDIR
+     bzr pull
+else
+     bzr branch ${BRANCH} $JENKINS_HOME/${BZRDIR}
+fi
+</command>
+    </hudson.tasks.Shell>
     <hudson.plugins.parameterizedtrigger.TriggerBuilder>
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
 
=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml'
--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml	2015-02-17 16:46:26 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml	2015-02-19 13:39:18 +0000
@@ -49,6 +49,9 @@
       <command>#!/bin/bash
 [ -n &quot;$WORKSPACE&quot; ] &amp;&amp; rm -Rf $WORKSPACE/*
 
+BRANCH=&quot;lp:ubiquity&quot;
+BZRDIR=`echo &quot;$BRANCH&quot; | awk -F: &apos;{ print $(NF) }&apos;`
+
 RELEASE=$(distro-info -d||distro-info -s)
 VARIANT={{ variant }}
 ISO=$JENKINS_HOME/isos/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
@@ -61,7 +64,7 @@
 
 echo &quot;I: Starting test $TESTNAME with image $ISO&quot;
 FULLNAME=&quot;ubiquity_autopilot_tests.tests.${TESTNAME}&quot;
-$JENKINS_HOME/ubiquity-autopilot-runner/run-ubiquity-test -t $FULLNAME $ISO</command>
+$JENKINS_HOME/$BZRDIR/autopilot/ubiquity-autopilot-runner/run-ubiquity-test -t $FULLNAME $ISO</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>