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

[Francis Ginther]

Add vivid+overlay builds to lp:unity8 and remove lp:unity8/overlay as this is now setup to do dual-landings in ci-train.

Add vivid+overlay builds to lp:unity8 and remove lp:unity8/overlay as this is now setup to do dual-landings in ci-train.

See https://trello.com/c/ysTbDcDl/560-vanguard-configure-lp-unity8-for-both-vivid-overlay-and-wily-builds for the request details.

[Michał Sawicz (saviq)]

Thanks!

review: Approve

[Para Siva (psivaa)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'stacks/head/unity8.cfg'
--- stacks/head/unity8.cfg	2015-07-13 22:19:05 +0000
+++ stacks/head/unity8.cfg	2015-09-16 16:21:42 +0000
@@ -4,7 +4,6 @@
   series-version: '15.04'
   ci_default:
     hooks: H05set_package_version A10checklicenseheaders
-    local_archive_pocket: wily
     configurations:
       wily-armhf:
         node_label: calxeda-pbuilder
@@ -18,25 +17,40 @@
   projects:
     unity8:
       autolanding_template: False
-      hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends
+      hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
       hook_source: lp:~canonical-ci-engineering/pbuilderjenkins/unity8-hooks
       test_suite: unity8
       test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
       archive_artifacts: '**/*test*.xml, **/coverage*.xml'
       publish_junit: '**/*test*.xml'
-      standard_jobs: generic-deb-autopilot-wily-touch unity-phablet-qmluitests-wily
+      standard_jobs: generic-deb-autopilot-vivid-touch unity-phablet-qmluitests-vivid generic-deb-autopilot-wily-touch unity-phablet-qmluitests-wily
       configurations:
         wily-i386:
+          local_archive_pocket: wily
           publish_junit: False
           archive_artifacts: False
           publish_coverage: False
         wily-amd64:
+          local_archive_pocket: wily
           publish_junit: False
           archive_artifacts: False
           publish_coverage: False
         wily-armhf: False
+        vivid-i386:
+          local_archive_pocket: vivid
+          node_label: pbuilder
+          publish_junit: False
+          archive_artifacts: False
+          publish_coverage: False
+        vivid-amd64:
+          local_archive_pocket: vivid
+          node_label: pbuilder
+          publish_junit: False
+          archive_artifacts: False
+          publish_coverage: False
     unity-api:
       autolanding_template: False
+      local_archive_pocket: wily
       hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results H10strip_native_depends
       configurations:
         wily-armhf:
@@ -45,6 +59,7 @@
       publish_coverage: '**/coverage*.xml'
     unity-scopes-api:
       autolanding_template: False
+      local_archive_pocket: wily
       hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends
       configurations:
         wily-i386:
@@ -53,3 +68,4 @@
           node_label: pbuilder-scopes
     unity-scopes-shell:
       autolanding_template: False
+      local_archive_pocket: wily

=== modified file 'stacks/vivid/unity8.cfg'
--- stacks/vivid/unity8.cfg	2015-08-19 02:51:41 +0000
+++ stacks/vivid/unity8.cfg	2015-09-16 16:21:42 +0000
@@ -16,26 +16,6 @@
     parallel_jobs: 2
     use_description_for_commit: False
   projects:
-    unity8:
-      autolanding_template: False
-      target_branch: lp:unity8/overlay
-      hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
-      hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook
-      test_suite: unity8
-      test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
-      archive_artifacts: '**/*test*.xml, **/coverage*.xml'
-      publish_junit: '**/*test*.xml'
-      standard_jobs: generic-deb-autopilot-vivid-touch unity-phablet-qmluitests-vivid
-      configurations:
-        vivid-i386:
-          publish_junit: False
-          archive_artifacts: False
-          publish_coverage: False
-        vivid-amd64:
-          publish_junit: False
-          archive_artifacts: False
-          publish_coverage: False
-        vivid-armhf: False
     unity-api:
       autolanding_template: False
       target_branch: lp:unity-api/trunk-15.04