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

[Paul Larson]

Here are some changes and updates that we needed in order to get the autopilot tests for ubiquity up and running again

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'autopilot/README.md'
--- autopilot/README.md	2013-11-22 14:29:50 +0000
+++ autopilot/README.md	2015-02-26 03:44:26 +0000
@@ -116,6 +116,7 @@
    handling to run multiple time in parallel.
 
         $ bzr cat lp:ubuntu-server-iso-testing/download-latest-test-iso.py > ~/bin/download-latest-test-iso.py
+        $ chmod 755 ~/bin/download-latest-test-iso.py
 
  * Create the following links in ~/bin/
 
@@ -138,7 +139,8 @@
 
  * Create the same symlinks than symlinks in `/home/ubiquity/bin/`
 
-        $ find /home/ubiquity/bin/ ! -type d -exec ln -s {} $HOME/bin/
+        $ find /home/ubiquity/bin/ ! -type d -exec ln -s {} $HOME/bin/ \;
+        $ ln -s /home/ubiquity/ubiquity/autopilot/ubiquity-autopilot-runner/ ubiquity-autopilot-runner
 
  * **Logout** from user jenkins
 

=== removed file 'autopilot/ubiquity-autopilot-runner/jenkins/config/edubuntu.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/edubuntu.cfg	2013-11-09 10:36:16 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/edubuntu.cfg	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-node: rabisu
-flavor: edubuntu
-variant: dvd
-cdimageurl: http://cdimage.ubuntu.com/edubuntu/dvd/pending/
-testcases: 
-    - test_custom_install
-    - test_english_default
-    - test_nonenglish_default

=== removed file 'autopilot/ubiquity-autopilot-runner/jenkins/config/lubuntu.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/lubuntu.cfg	2013-11-09 10:36:16 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/lubuntu.cfg	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-node: rabisu
-flavor: lubuntu
-variant: desktop
-cdimageurl: http://cdimage.ubuntu.com/lubuntu/daily-live/pending/
-testcases: 
-    - test_custom_install
-    - test_english_default
-    - test_nonenglish_default

=== removed file 'autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu-gnome.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu-gnome.cfg	2013-11-09 10:36:16 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu-gnome.cfg	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-node: rabisu
-flavor: ubuntu-gnome
-variant: desktop
-cdimageurl: http://cdimage.ubuntu.com/ubuntu-gnome/daily-live/pending/
-testcases: 
-    - test_custom_install
-    - test_english_default
-    - test_english_lvm
-    - test_english_encrypt_lvm
-    - test_nonenglish_default

=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg	2014-03-28 15:25:31 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg	2015-02-26 03:44:26 +0000
@@ -1,4 +1,4 @@
-node: rabisu
+node: master
 flavor: ubuntu
 variant: desktop
 cdimageurl: http://cdimage.ubuntu.com/daily-live/pending/

=== removed file 'autopilot/ubiquity-autopilot-runner/jenkins/config/xubuntu.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/xubuntu.cfg	2013-11-09 10:36:16 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/xubuntu.cfg	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-node: rabisu
-flavor: xubuntu
-variant: desktop
-cdimageurl: http://cdimage.ubuntu.com/xubuntu/daily-live/pending/
-testcases: 
-    - test_custom_install
-    - test_english_default
-    - test_nonenglish_default

=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/publish2jenkins'
--- autopilot/ubiquity-autopilot-runner/jenkins/publish2jenkins	2013-11-08 09:25:04 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/publish2jenkins	2015-02-26 03:44:26 +0000
@@ -27,7 +27,7 @@
 TEMPLATE_DIR=$BASEDIR/templates
 UPDATE_CMD=$BASEDIR/update-jenkins-job
 UPDATE_OPTS="-U"
-SERVER=drude
+SERVER=${SERVER:-drude}
 
 on_exit() {
     # Do some cleanup
@@ -40,6 +40,7 @@
 for cfg in $CONFIG_DIR/*cfg; do
     flavor=$(grep ^flavor $cfg |awk '{print $2}')
     variant=$(grep ^variant $cfg |awk '{print $2}')
+    node=$(grep ^node $cfg |awk '{print $2}')
 
     echo "I: Updating flavor '$flavor'"
     # Download jobs
@@ -65,6 +66,7 @@
 flavor: $flavor
 variant: $(grep ^variant $cfg |cut -d: -f2)
 testcase: $testcase
+node: $node
 EOF
         echo "I: Updating testcase '$testcase'"
         $UPDATE_CMD $UPDATE_OPTS -J $SERVER \

=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-download.xml'
--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-download.xml	2013-11-11 11:52:51 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-download.xml	2015-02-26 03:44:26 +0000
@@ -31,10 +31,25 @@
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers class="vector">
-    <com.redfin.hudson.UrlChangeTrigger>
-      <spec></spec>
-      <url>{{ cdimageurl }}/MD5SUMS</url>
-    </com.redfin.hudson.UrlChangeTrigger>
+    <org.jenkinsci.plugins.urltrigger.URLTrigger plugin="urltrigger@0.37">
+        <spec>*/15 * * * *</spec>
+        <entries>
+            <org.jenkinsci.plugins.urltrigger.URLTriggerEntry>
+                <url>{{ cdimageurl }}/MD5SUMS</url>
+                <proxyActivated>false</proxyActivated>
+                <checkStatus>false</checkStatus>
+                <statusCode>200</statusCode>
+                <timeout>300</timeout>
+                <checkETag>false</checkETag>
+                <checkLastModificationDate>false</checkLastModificationDate>
+                <inspectingContent>true</inspectingContent>
+                <contentTypes>
+                    <org.jenkinsci.plugins.urltrigger.content.SimpleContentType/>
+                </contentTypes>
+            </org.jenkinsci.plugins.urltrigger.URLTriggerEntry>
+        </entries>
+        <labelRestriction>false</labelRestriction>
+    </org.jenkinsci.plugins.urltrigger.URLTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>

=== 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-26 03:44:26 +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	2013-12-20 08:15:37 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml	2015-02-26 03:44:26 +0000
@@ -40,7 +40,7 @@
     <hudson.matrix.LabelAxis>
       <name>label</name>
       <values>
-        <string>rabisu</string>
+        <string>{{ node }}</string>
       </values>
     </hudson.matrix.LabelAxis>
   </axes>
@@ -49,9 +49,12 @@
       <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/iso/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
+ISO=$JENKINS_HOME/isos/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
 TESTNAME={{ testcase }}
 
 if [ ! -f &quot;$ISO&quot; ]; then
@@ -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>