Merge lp:~fginther/cupstream2distro-config/qtmir-wily-vivid-overlay into lp:cupstream2distro-config

[Francis Ginther]

Add vivid+overlay builds for lp:qtmir to support dual landings.

Add vivid+overlay builds for lp:qtmir to support dual landings.

As with other recent changes to support dual landings, this is just adding vivid+overlay builds to the main project branch. Add the overlay to wily is a no-op for wily as there are no wily packages published.

The local_archive_pocket value must match the build flavor, this is used as part of the process to give the code under build a proper version string.

Tested here:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/426/console

Task:
https://trello.com/c/3jOpVVPs/562-vanguard-configure-lp-qtmir-for-both-vivid-overlay-and-wily-builds

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1313
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/874/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/109

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

review: Approve (continuous-integration)

[Para Siva (psivaa)]

Thanks for the info + test results

review: Approve

=== modified file 'stacks/head/mir.cfg'
--- stacks/head/mir.cfg	2015-07-28 19:47:42 +0000
+++ stacks/head/mir.cfg	2015-09-17 21:34:49 +0000
@@ -4,7 +4,6 @@
   series-version: '15.04'
   ci_default:
     hooks: H05set_package_version
-    local_archive_pocket: wily
     configurations:
       wily-amd64:
         node_label: pbuilder
@@ -18,6 +17,7 @@
     mir:
       target_branch: lp:mir/ubuntu
       autolanding_template: False
+      local_archive_pocket: wily
       contact_email: [e-mail]
       hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run H15enable_testing D10install_valgrind B09copy_results C09copy_results
       archive_artifacts: '**/*xml, **/output/*deb'
@@ -34,23 +34,43 @@
       # TODO irc if autolanding fails
     lightdm:
       autolanding_template: False
+      local_archive_pocket: wily
       hooks: H05set_package_version H40native_hack.py
       autolanding:
         ppa_target: ppa:lightdm-team/daily
         distributions: precise,trusty,utopic,wily
     qtmir:
       autolanding_template: False
-      hooks: H05set_package_version H10strip_native_depends
+      hooks: H05set_package_version H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
       configurations:
+        vivid-amd64:
+          local_archive_pocket: vivid
+          node_label: pbuilder
+        vivid-i386:
+          local_archive_pocket: vivid
+          node_label: pbuilder
+        vivid-armhf:
+          local_archive_pocket: vivid
+          node_label: calxeda-pbuilder
+          archive_artifacts: '**/output/*deb'
+        wily-amd64:
+          local_archive_pocket: wily
+        wily-i386:
+          local_archive_pocket: wily
+          node_label: pbuilder
         wily-armhf:
+          local_archive_pocket: wily
           archive_artifacts: '**/output/*deb'
     unity-greeter:
       autolanding_template: False
+      local_archive_pocket: wily
       autolanding:
         ppa_target: ppa:unity-greeter-team/staging
     unity-greeter-session-broadcast:
       autolanding_template: False
+      local_archive_pocket: wily
     unity-system-compositor:
       target_branch: lp:unity-system-compositor/ubuntu
       autolanding_template: False
+      local_archive_pocket: wily
       contact_email: [e-mail]