ubiquity

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

  1. update-ubiquity-tests
  2. Merge into ubiquity-ci-testing
Proposed by Para Siva
Status: Merged
Merged at revision: 6268
Proposed branch: lp:~psivaa/ubiquity/update-ubiquity-tests
Merge into: lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing
Diff against target: 46 lines (+17/-1)
2 files modified
autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml (+13/-0)
autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml (+4/-1)
To merge this branch: bzr merge lp:~psivaa/ubiquity/update-ubiquity-tests
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+250307@code.launchpad.net

Commit message

Update the local ubiquity tests for ever test run.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml'
2--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml 2013-12-20 08:15:37 +0000
3+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-run.xml 2015-02-19 13:39:18 +0000
4@@ -30,6 +30,19 @@
5 <triggers class="vector"/>
6 <concurrentBuild>false</concurrentBuild>
7 <builders>
8+ <hudson.tasks.Shell>
9+ <command>#!/bin/bash
10+
11+BRANCH=&quot;lp:ubiquity&quot;
12+BZRDIR=`echo &quot;$BRANCH&quot; | awk -F: &apos;{ print $(NF) }&apos;`
13+if [ -d $JENKINS_HOME/$BZRDIR ]; then
14+ cd $JENKINS_HOME/$BZRDIR
15+ bzr pull
16+else
17+ bzr branch ${BRANCH} $JENKINS_HOME/${BZRDIR}
18+fi
19+</command>
20+ </hudson.tasks.Shell>
21 <hudson.plugins.parameterizedtrigger.TriggerBuilder>
22 <configs>
23 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
24
25=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml'
26--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml 2015-02-17 16:46:26 +0000
27+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml 2015-02-19 13:39:18 +0000
28@@ -49,6 +49,9 @@
29 <command>#!/bin/bash
30 [ -n &quot;$WORKSPACE&quot; ] &amp;&amp; rm -Rf $WORKSPACE/*
31
32+BRANCH=&quot;lp:ubiquity&quot;
33+BZRDIR=`echo &quot;$BRANCH&quot; | awk -F: &apos;{ print $(NF) }&apos;`
34+
35 RELEASE=$(distro-info -d||distro-info -s)
36 VARIANT={{ variant }}
37 ISO=$JENKINS_HOME/isos/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
38@@ -61,7 +64,7 @@
39
40 echo &quot;I: Starting test $TESTNAME with image $ISO&quot;
41 FULLNAME=&quot;ubiquity_autopilot_tests.tests.${TESTNAME}&quot;
42-$JENKINS_HOME/ubiquity-autopilot-runner/run-ubiquity-test -t $FULLNAME $ISO</command>
43+$JENKINS_HOME/$BZRDIR/autopilot/ubiquity-autopilot-runner/run-ubiquity-test -t $FULLNAME $ISO</command>
44 </hudson.tasks.Shell>
45 </builders>
46 <publishers>

Subscribers

People subscribed via source and target branches