Merge lp:~fginther/cupstream2distro-config/move-to-wily into lp:cupstream2distro-config

[Francis Ginther]

Move unity-api, unity-scopes-api, unity-scopes-shell, unity-scope-mediascanner from vivid to wily.

Move unity-api, unity-scopes-api, unity-scopes-shell, unity-scope-mediascanner from vivid to wily.

https://trello.com/c/88g4PdBi/270-vanguard-move-some-more-projects-to-wily

[Paul Larson (pwlars)]

Thanks for the explanation, +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'stacks/head/unity.cfg'
--- stacks/head/unity.cfg	2015-05-14 22:16:59 +0000
+++ stacks/head/unity.cfg	2015-05-21 14:49:12 +0000
@@ -60,3 +60,5 @@
           hooks: H05set_package_version D10install_google_test B09googletests B09copy_results C09copy_results
     unity-asset-pool:
       autolanding_template: False
+    unity-scope-mediascanner:
+      autolanding_template: False

=== modified file 'stacks/head/unity8.cfg'
--- stacks/head/unity8.cfg	2015-05-15 18:36:03 +0000
+++ stacks/head/unity8.cfg	2015-05-21 14:49:12 +0000
@@ -35,3 +35,21 @@
           archive_artifacts: False
           publish_coverage: False
         wily-armhf: False
+    unity-api:
+      autolanding_template: False
+      hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results H10strip_native_depends
+      configurations:
+        vivid-armhf:
+          archive_artifacts: '**/coverage*.xml, **/output/*deb'
+      archive_artifacts: '**/coverage*.xml'
+      publish_coverage: '**/coverage*.xml'
+    unity-scopes-api:
+      autolanding_template: False
+      hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends
+      configurations:
+        vivid-i386:
+          node_label: pbuilder-scopes
+        vivid-amd64:
+          node_label: pbuilder-scopes
+    unity-scopes-shell:
+      autolanding_template: False

=== modified file 'stacks/vivid/unity.cfg'
--- stacks/vivid/unity.cfg	2015-05-14 22:16:59 +0000
+++ stacks/vivid/unity.cfg	2015-05-21 14:49:12 +0000
@@ -16,9 +16,6 @@
       vivid-armhf:
         node_label: calxeda-pbuilder
         publish_coverage: False
-  projects:
-    unity-scope-mediascanner:
-      autolanding_template: False
   to_transition:
     activity-log-manager:
       autolanding_template: False
@@ -133,6 +130,8 @@
       autolanding_template: False
     unity-scope-manpages:
       autolanding_template: False
+    unity-scope-mediascanner:
+      autolanding_template: False
     unity-scope-musique:
       autolanding_template: False
     unity-scope-onlinemusic:

=== modified file 'stacks/vivid/unity8.cfg'
--- stacks/vivid/unity8.cfg	2015-05-15 02:03:50 +0000
+++ stacks/vivid/unity8.cfg	2015-05-21 14:49:12 +0000
@@ -36,6 +36,7 @@
           archive_artifacts: False
           publish_coverage: False
         vivid-armhf: False
+  to_transition:
     unity-api:
       autolanding_template: False
       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
@@ -44,18 +45,6 @@
           archive_artifacts: '**/coverage*.xml, **/output/*deb'
       archive_artifacts: '**/coverage*.xml'
       publish_coverage: '**/coverage*.xml'
-    unity-scopes-api:
-      autolanding_template: False
-      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
-      configurations:
-        vivid-i386:
-          node_label: pbuilder-scopes
-        vivid-amd64:
-          node_label: pbuilder-scopes
-    unity-scopes-shell:
-      autolanding_template: False
-  to_transition:
     unity-mir:
       autolanding_template: False
       configurations:
@@ -69,3 +58,14 @@
           archive_artifacts: '**/coverage*.xml, **/output/*deb'
       archive_artifacts: '**/coverage*.xml'
       publish_coverage: '**/coverage*.xml'
+    unity-scopes-api:
+      autolanding_template: False
+      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
+      configurations:
+        vivid-i386:
+          node_label: pbuilder-scopes
+        vivid-amd64:
+          node_label: pbuilder-scopes
+    unity-scopes-shell:
+      autolanding_template: False