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

[Francis Ginther]

Add vivid+overlay builds to lp:unity-api and remove lp:unity-api/trunk-15.04 to support dual landings.

Add vivid+overlay builds to lp:unity-api and remove lp:unity-api/trunk-15.04 to support dual landings.

Essentially this change is to add vivid builds to lp:unity-api. These require the vivid overlay PPA which also applies to the wily builds as it's specified in the projects only hooks entry. Add the PPA is a no-op right now as there are only vivid packages in that PPA.

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.

These changes are under test here:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/334/console

Task:
https://trello.com/c/IvGtTaed/561-vanguard-configure-lp-unity-api-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/872/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/107

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

review: Approve (continuous-integration)

[lp:~fginther/cupstream2distro-config/unity-api-wily-vivid-overlay]

1314. By Francis Ginther on 2015-09-17

Also remove configuration for lp:unity-api/trunk-15.04.

[Joe Talbott (joetalbott)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'stacks/head/unity8.cfg'
--- stacks/head/unity8.cfg	2015-09-16 16:19:47 +0000
+++ stacks/head/unity8.cfg	2015-09-17 20:53:08 +0000
@@ -50,10 +50,24 @@
           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
+      hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
       configurations:
+        wily-amd64:
+          local_archive_pocket: wily
+        wily-i386:
+          local_archive_pocket: wily
         wily-armhf:
+          local_archive_pocket: wily
+          archive_artifacts: '**/coverage*.xml, **/output/*deb'
+        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: '**/coverage*.xml, **/output/*deb'
       archive_artifacts: '**/coverage*.xml'
       publish_coverage: '**/coverage*.xml'
 
=== modified file 'stacks/vivid/unity8.cfg'
--- stacks/vivid/unity8.cfg	2015-09-16 16:13:31 +0000
+++ stacks/vivid/unity8.cfg	2015-09-17 20:53:08 +0000
@@ -16,15 +16,6 @@
     parallel_jobs: 2
     use_description_for_commit: False
   projects:
-    unity-api:
-      autolanding_template: False
-      target_branch: lp:unity-api/trunk-15.04
-      hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
-      configurations:
-        vivid-armhf:
-          archive_artifacts: '**/coverage*.xml, **/output/*deb'
-      archive_artifacts: '**/coverage*.xml'
-      publish_coverage: '**/coverage*.xml'
     unity-scopes-api:
       autolanding_template: False
       target_branch: lp:unity-scopes-api/trunk-15.04