cupstream2distro Configuration

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

  1. move-to-wily
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 1269
Merged at revision: 1271
Proposed branch: lp:~fginther/cupstream2distro-config/move-to-wily
Merge into: lp:cupstream2distro-config
Diff against target: 104 lines (+34/-15)
4 files modified
stacks/head/unity.cfg (+2/-0)
stacks/head/unity8.cfg (+18/-0)
stacks/vivid/unity.cfg (+2/-3)
stacks/vivid/unity8.cfg (+12/-12)
To merge this branch: bzr merge lp:~fginther/cupstream2distro-config/move-to-wily
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Paul Larson Approve
Review via email: mp+259778@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Thanks for the explanation, +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
60 hooks: H05set_package_version D10install_google_test B09googletests B09copy_results C09copy_results60 hooks: H05set_package_version D10install_google_test B09googletests B09copy_results C09copy_results
61 unity-asset-pool:61 unity-asset-pool:
62 autolanding_template: False62 autolanding_template: False
63 unity-scope-mediascanner:
64 autolanding_template: False
6365
=== 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 @@
35 archive_artifacts: False35 archive_artifacts: False
36 publish_coverage: False36 publish_coverage: False
37 wily-armhf: False37 wily-armhf: False
38 unity-api:
39 autolanding_template: False
40 hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run C09copy_results H10strip_native_depends
41 configurations:
42 vivid-armhf:
43 archive_artifacts: '**/coverage*.xml, **/output/*deb'
44 archive_artifacts: '**/coverage*.xml'
45 publish_coverage: '**/coverage*.xml'
46 unity-scopes-api:
47 autolanding_template: False
48 hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends
49 configurations:
50 vivid-i386:
51 node_label: pbuilder-scopes
52 vivid-amd64:
53 node_label: pbuilder-scopes
54 unity-scopes-shell:
55 autolanding_template: False
3856
=== 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 @@
16 vivid-armhf:16 vivid-armhf:
17 node_label: calxeda-pbuilder17 node_label: calxeda-pbuilder
18 publish_coverage: False18 publish_coverage: False
19 projects:
20 unity-scope-mediascanner:
21 autolanding_template: False
22 to_transition:19 to_transition:
23 activity-log-manager:20 activity-log-manager:
24 autolanding_template: False21 autolanding_template: False
@@ -133,6 +130,8 @@
133 autolanding_template: False130 autolanding_template: False
134 unity-scope-manpages:131 unity-scope-manpages:
135 autolanding_template: False132 autolanding_template: False
133 unity-scope-mediascanner:
134 autolanding_template: False
136 unity-scope-musique:135 unity-scope-musique:
137 autolanding_template: False136 autolanding_template: False
138 unity-scope-onlinemusic:137 unity-scope-onlinemusic:
139138
=== 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 @@
36 archive_artifacts: False36 archive_artifacts: False
37 publish_coverage: False37 publish_coverage: False
38 vivid-armhf: False38 vivid-armhf: False
39 to_transition:
39 unity-api:40 unity-api:
40 autolanding_template: False41 autolanding_template: False
41 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-overlay42 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 @@
44 archive_artifacts: '**/coverage*.xml, **/output/*deb'45 archive_artifacts: '**/coverage*.xml, **/output/*deb'
45 archive_artifacts: '**/coverage*.xml'46 archive_artifacts: '**/coverage*.xml'
46 publish_coverage: '**/coverage*.xml'47 publish_coverage: '**/coverage*.xml'
47 unity-scopes-api:
48 autolanding_template: False
49 hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
50 hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook
51 configurations:
52 vivid-i386:
53 node_label: pbuilder-scopes
54 vivid-amd64:
55 node_label: pbuilder-scopes
56 unity-scopes-shell:
57 autolanding_template: False
58 to_transition:
59 unity-mir:48 unity-mir:
60 autolanding_template: False49 autolanding_template: False
61 configurations:50 configurations:
@@ -69,3 +58,14 @@
69 archive_artifacts: '**/coverage*.xml, **/output/*deb'58 archive_artifacts: '**/coverage*.xml, **/output/*deb'
70 archive_artifacts: '**/coverage*.xml'59 archive_artifacts: '**/coverage*.xml'
71 publish_coverage: '**/coverage*.xml'60 publish_coverage: '**/coverage*.xml'
61 unity-scopes-api:
62 autolanding_template: False
63 hooks: H05set_package_version A10checklicenseheaders H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
64 hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook
65 configurations:
66 vivid-i386:
67 node_label: pbuilder-scopes
68 vivid-amd64:
69 node_label: pbuilder-scopes
70 unity-scopes-shell:
71 autolanding_template: False

Subscribers

People subscribed via source and target branches

to all changes: