Merge lp:~didrocks/cupstream2distro-config/use-generic-job into lp:cupstream2distro-config

[Didier Roche-Tolomelli]

Use generic autopilot job

Use generic autopilot job

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-raring-amd64-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/62/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

LGTM, should work with the new generic job. Approve.

review: Approve

=== modified file 'daily-release/cu2d-update-stack'
--- daily-release/cu2d-update-stack	2013-04-01 14:30:31 +0000
+++ daily-release/cu2d-update-stack	2013-04-02 15:29:17 +0000
@@ -167,9 +167,10 @@
         ctx = dict(ctxbase)
         ctx['opts'] = '-a -s %s -p %s' % (stack['series'], stack['ppa'])
         ctx['extracheck'] = stack['extracheck']
-        checkparameters = 'ppa={}'.format(stack['ppa'])
+        checkparameters = 'stack={}\nrelease={}\nseries={}\nppa={}'.format(stack['name'],
+                           release, stack['series'], stack['ppa'])
         for parameter in stack.get('test_parameters', {}):
-          checkparameters += '\n{}={}'.format(parameter, stack['test_parameters'][parameter])
+            checkparameters += '\n{}={}'.format(parameter, stack['test_parameters'][parameter])
         ctx['checkparameters'] = checkparameters
         setup_job(jkh, jjenv, jobname, TEMPLATES['check'],
                   ctx, update)

=== modified file 'daily-release/jenkins-templates/check-stack-config.xml.tmpl'
--- daily-release/jenkins-templates/check-stack-config.xml.tmpl	2013-04-01 14:30:31 +0000
+++ daily-release/jenkins-templates/check-stack-config.xml.tmpl	2013-04-02 15:29:17 +0000
@@ -22,10 +22,10 @@
 cd $WRKDIR
 
 echo "Removing skip file (initial cleaning)"
-rm -f /tmp/autopilot.{{ stack }}.skip
+rm -f /tmp/autopilot.{{ release }}.{{ stack }}.skip
 if [ -z "$(ls $WRKDIR/*.project 2>/dev/null)" -a "$CHECK_WITH_WHOLE_PPA" != "true" ]; then
     echo "No new source uploaded to PPA and CHECK_WITH_WHOLE_PPA is not set.  Skipping check!"
-    echo "<testsuite errors='0' failures='0' name='' tests='1' time='0.001'><testcase classname='notest.skip' name='skipped' time='0.001'/></testsuite>" > /tmp/autopilot.{{ stack }}.skip
+    echo "<testsuite errors='0' failures='0' name='' tests='1' time='0.001'><testcase classname='notest.skip' name='skipped' time='0.001'/></testsuite>" > /tmp/autopilot.{{ release }}.{{ stack }}.skip
     exit 0
 fi
 
@@ -63,9 +63,9 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash -u
 
-if [ -e /tmp/autopilot.{{ stack }}.skip ]; then
+if [ -e /tmp/autopilot.{{ release }}.{{ stack }}.skip ]; then
     echo "Removing Skip file"
-    rm /tmp/autopilot.{{ stack }}.skip
+    rm /tmp/autopilot.{{ release }}.{{ stack }}.skip
     exit 0
 fi
 

=== modified file 'stacks/raring/indicators.cfg'
--- stacks/raring/indicators.cfg	2013-04-01 14:30:31 +0000
+++ stacks/raring/indicators.cfg	2013-04-02 15:29:17 +0000
@@ -2,7 +2,7 @@
   name: indicators
   series: raring
   ppa: ubuntu-unity/daily-build
-  extracheck: ps-indicators-autopilot-release-testing
+  extracheck: ps-generic-autopilot-release-testing
   schedule: 0 2 * * 1-5
   dependencies:
     - qa

=== modified file 'stacks/raring/oif.cfg'
--- stacks/raring/oif.cfg	2013-04-01 14:30:31 +0000
+++ stacks/raring/oif.cfg	2013-04-02 15:29:17 +0000
@@ -2,7 +2,7 @@
   name: oif
   series: raring
   ppa: ubuntu-unity/daily-build
-  extracheck: ps-oif-autopilot-release-testing
+  extracheck: ps-generic-autopilot-release-testing
   schedule: 0 2 * * 1-5
   ci_default:
     contact_email: "[e-mail]"

=== modified file 'stacks/raring/unity.cfg'
--- stacks/raring/unity.cfg	2013-04-02 08:48:08 +0000
+++ stacks/raring/unity.cfg	2013-04-02 15:29:17 +0000
@@ -2,7 +2,7 @@
   name: unity
   series: raring
   ppa: ubuntu-unity/daily-build
-  extracheck: ps-unity-autopilot-release-testing
+  extracheck: ps-generic-autopilot-release-testing
   schedule: 0 4 * * 1-5
   ci_default:
     contact_email: "[e-mail]"
@@ -32,6 +32,8 @@
     local_archive_tmp: /home/ubuntu/ppa_archive/staging
     local_archive_source: http://naartjie/archive/staging
     local_archive_pocket: raring
+  test_parameters:
+    tests: unity
   dependencies:
     - indicators
     - oif