cupstream2distro Configuration

Merge lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity into lp:cupstream2distro-config

  1. saucy_transition_misc_unity
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: no longer in the source branch.
Merged at revision: 858
Proposed branch: lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity
Merge into: lp:cupstream2distro-config
Diff against target: 209 lines (+51/-12)
4 files modified
stacks/head/misc.cfg (+3/-4)
stacks/head/unity.cfg (+1/-2)
stacks/saucy/misc.cfg (+11/-5)
stacks/saucy/unity.cfg (+36/-1)
To merge this branch: bzr merge lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
PS Jenkins bot continuous-integration Approve
Francis Ginther Needs Fixing
Review via email: mp+191989@code.launchpad.net

Commit message

Transition saucy unity + misc stack configs to use /saucy branches, and compiz head to use lp:compiz/0.9.11. Remove to_transition from head unity + misc, and mark saucy misc non-branched projects with "to_remove".

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:853
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/556/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/354

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cupstream2distro-config-ci/556/rebuild

review: Approve (continuous-integration)
lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity updated
854. By Chris Gagnon

enable armhf builds in mir-development branch.

Approved by PS Jenkins bot, Francis Ginther.

855. By Omer Akram

disable unity8 autolanding, its not working.

Approved by Francis Ginther, PS Jenkins bot.

856. By Chris Gagnon

disable junit publish on armhf.

Approved by Francis Ginther, PS Jenkins bot.

Revision history for this message
Francis Ginther (fginther) wrote :

stacks/head/unity.cfg and stacks/head/misc.cfg need to be updated to remove the "to_transition" block. Once this is done, the same project/branch cannot exist in both stacks/saucy/misc.cfg and stacks/head/misc.cfg. Duplicates either need to be removed or moved to a "to_remove" block as sil2100 has proposed in another MP.

review: Needs Fixing
lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity updated
857. By Francis Ginther

Split desktop-shared branches into head and saucy. For touch specific branches I decided to introduce the notation of to_remove: - this way the branches are around, but not daily-released anymore. We can remove them completely when we decide on how to do that in the end.

Approved by PS Jenkins bot, Robert Bruce Park.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Fixed as instructed. Still uncertain about what the cov_stream are, so improvised.

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

FAILED: Continuous integration, rev:855
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/561/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/359/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cupstream2distro-config-ci/561/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:856
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/562/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/360/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cupstream2distro-config-ci/562/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:857
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/563/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/361

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cupstream2distro-config-ci/563/rebuild

review: Approve (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looking nice.

review: Approve
lp:~cupstream2distro-maintainers/cupstream2distro-config/saucy_transition_misc_unity updated
858. By Timo Jyrinki

Transition saucy unity + misc stack configs to use /saucy branches, and compiz head to use lp:compiz/0.9.11. Remove to_transition from head unity + misc, and mark saucy misc non-branched projects with "to_remove".

Approved by Łukasz Zemczak, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/head/misc.cfg'
--- stacks/head/misc.cfg 2013-09-27 20:49:54 +0000
+++ stacks/head/misc.cfg 2013-10-22 05:17:06 +0000
@@ -15,19 +15,18 @@
15 saucy-armhf:15 saucy-armhf:
16 node_label: calxeda-pbuilder16 node_label: calxeda-pbuilder
17 projects:17 projects:
18 to_transition:
19 android-audiosystem:18 android-audiosystem:
20 configurations:19 configurations:
21 saucy-amd64: False20 saucy-amd64: False
22 gnome-control-center-unity:21 gnome-control-center-unity:
23 contact_email: francis.ginther@canonical.com22 contact_email: francis.ginther@canonical.com
24 notify-osd:23 notify-osd:
25 cov_stream: notify-osd-13.1024 cov_stream: notify-osd-14.04
26 configurations:25 configurations:
27 generic-coverity-check:26 generic-coverity-check:
28 template: False27 template: False
29 overlay-scrollbar:28 overlay-scrollbar:
30 cov_stream: overlay-scrollbar-13.1029 cov_stream: overlay-scrollbar-14.04
31 configurations:30 configurations:
32 generic-coverity-check:31 generic-coverity-check:
33 template: False32 template: False
@@ -36,7 +35,7 @@
36 ubuntu-themes:35 ubuntu-themes:
37 ubuntu-wallpapers:36 ubuntu-wallpapers:
38 unico:37 unico:
39 cov_stream: unico-13.1038 cov_stream: unico-14.04
40 configurations:39 configurations:
41 generic-coverity-check:40 generic-coverity-check:
42 template: False41 template: False
4342
=== modified file 'stacks/head/unity.cfg'
--- stacks/head/unity.cfg 2013-10-02 12:02:12 +0000
+++ stacks/head/unity.cfg 2013-10-22 05:17:06 +0000
@@ -44,9 +44,8 @@
44 - hud44 - hud
45# - media # Uncomment once unity-scope-mediascanner is ready to land45# - media # Uncomment once unity-scope-mediascanner is ready to land
46 projects:46 projects:
47 to_transition:
48 compiz:47 compiz:
49 target_branch: lp:compiz/0.9.1048 target_branch: lp:compiz/0.9.11
50 build_timeout: 24049 build_timeout: 240
51 archive_artifacts: '**/results/**'50 archive_artifacts: '**/results/**'
52 publish_coverage: '**/results/coverage.xml'51 publish_coverage: '**/results/coverage.xml'
5352
=== modified file 'stacks/saucy/misc.cfg'
--- stacks/saucy/misc.cfg 2013-09-27 20:49:54 +0000
+++ stacks/saucy/misc.cfg 2013-10-22 05:17:06 +0000
@@ -15,25 +15,31 @@
15 saucy-armhf:15 saucy-armhf:
16 node_label: calxeda-pbuilder16 node_label: calxeda-pbuilder
17 projects:17 projects:
18 android-audiosystem:
19 configurations:
20 saucy-amd64: False
21 gnome-control-center-unity:18 gnome-control-center-unity:
19 target_branch: lp:gnome-control-center-unity/saucy
22 contact_email: francis.ginther@canonical.com20 contact_email: francis.ginther@canonical.com
23 notify-osd:21 notify-osd:
22 target_branch: lp:notify-osd/saucy
24 cov_stream: notify-osd-13.1023 cov_stream: notify-osd-13.10
25 configurations:24 configurations:
26 generic-coverity-check:25 generic-coverity-check:
27 template: False26 template: False
28 overlay-scrollbar:27 overlay-scrollbar:
28 target_branch: lp:overlay-toolbar/saucy
29 cov_stream: overlay-scrollbar-13.1029 cov_stream: overlay-scrollbar-13.10
30 configurations:30 configurations:
31 generic-coverity-check:31 generic-coverity-check:
32 template: False32 template: False
33 ubuntu-themes:
34 target_branch: lp:ubuntu-themes/saucy
35 ubuntu-wallpapers:
36 target_branch: lp:ubuntu-wallpapers/saucy
37 to_remove:
38 android-audiosystem:
39 configurations:
40 saucy-amd64: False
33 phablet-tools:41 phablet-tools:
34 contact_email: sergio.schvezov@canonical.com42 contact_email: sergio.schvezov@canonical.com
35 ubuntu-themes:
36 ubuntu-wallpapers:
37 unico:43 unico:
38 cov_stream: unico-13.1044 cov_stream: unico-13.10
39 configurations:45 configurations:
4046
=== modified file 'stacks/saucy/unity.cfg'
--- stacks/saucy/unity.cfg 2013-10-02 12:02:12 +0000
+++ stacks/saucy/unity.cfg 2013-10-22 05:17:06 +0000
@@ -45,7 +45,7 @@
45# - media # Uncomment once unity-scope-mediascanner is ready to land45# - media # Uncomment once unity-scope-mediascanner is ready to land
46 projects:46 projects:
47 compiz:47 compiz:
48 target_branch: lp:compiz/0.9.1048 target_branch: lp:compiz/saucy
49 build_timeout: 24049 build_timeout: 240
50 archive_artifacts: '**/results/**'50 archive_artifacts: '**/results/**'
51 publish_coverage: '**/results/coverage.xml'51 publish_coverage: '**/results/coverage.xml'
@@ -61,8 +61,11 @@
61 saucy-armhf:61 saucy-armhf:
62 hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind62 hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind
63 libunity:63 libunity:
64 target_branch: lp:libunity/saucy
64 libunity-misc:65 libunity-misc:
66 target_branch: lp:libunity-misc/saucy
65 nux:67 nux:
68 target_branch: lp:nux/saucy
66 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov69 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
67 archive_artifacts: '**/results/**'70 archive_artifacts: '**/results/**'
68 publish_coverage: '**/results/coverage.xml'71 publish_coverage: '**/results/coverage.xml'
@@ -71,6 +74,7 @@
71 saucy-armhf:74 saucy-armhf:
72 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results75 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results
73 unity:76 unity:
77 target_branch: lp:unity/saucy
74 build_timeout: 24078 build_timeout: 240
75 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results79 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
76 archive_artifacts: '**/results/**'80 archive_artifacts: '**/results/**'
@@ -80,7 +84,9 @@
80 saucy-armhf:84 saucy-armhf:
81 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results85 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
82 unity-asset-pool:86 unity-asset-pool:
87 target_branch: lp:unity-asset-pool/saucy
83 unity-lens-applications:88 unity-lens-applications:
89 target_branch: lp:unity-lens-applications/saucy
84 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov90 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
85 configurations:91 configurations:
86 saucy-armhf:92 saucy-armhf:
@@ -89,8 +95,11 @@
89 archive_artifacts: '**/results/**'95 archive_artifacts: '**/results/**'
90 publish_coverage: '**/results/coverage.xml'96 publish_coverage: '**/results/coverage.xml'
91 unity-lens-files:97 unity-lens-files:
98 target_branch: lp:unity-lens-files/saucy
92 unity-lens-friends:99 unity-lens-friends:
100 target_branch: lp:unity-lens-friends/saucy
93 unity-lens-music:101 unity-lens-music:
102 target_branch: lp:unity-lens-music/saucy
94 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov103 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
95 configurations:104 configurations:
96 saucy-armhf:105 saucy-armhf:
@@ -99,7 +108,9 @@
99 archive_artifacts: '**/results/**'108 archive_artifacts: '**/results/**'
100 publish_coverage: '**/results/coverage.xml'109 publish_coverage: '**/results/coverage.xml'
101 unity-lens-photos:110 unity-lens-photos:
111 target_branch: lp:unity-lens-photos/saucy
102 unity-lens-video:112 unity-lens-video:
113 target_branch: lp:unity-lens-video/saucy
103 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov114 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
104 configurations:115 configurations:
105 saucy-armhf:116 saucy-armhf:
@@ -108,29 +119,53 @@
108 archive_artifacts: '**/results/**'119 archive_artifacts: '**/results/**'
109 publish_coverage: '**/results/coverage.xml'120 publish_coverage: '**/results/coverage.xml'
110 unity-scope-audacious:121 unity-scope-audacious:
122 target_branch: lp:unity-scope-audacious/saucy
111 unity-scope-chromiumbookmarks:123 unity-scope-chromiumbookmarks:
124 target_branch: lp:unity-scope-chromiumbookmarks/saucy
112 unity-scope-calculator:125 unity-scope-calculator:
126 target_branch: lp:unity-scope-calculator/saucy
113 unity-scope-clementine:127 unity-scope-clementine:
128 target_branch: lp:unity-scope-clementine/saucy
114 unity-scope-colourlovers:129 unity-scope-colourlovers:
130 target_branch: lp:unity-scope-colourlovers/saucy
115 unity-scope-devhelp:131 unity-scope-devhelp:
132 target_branch: lp:unity-scope-devhelp/saucy
116 unity-scope-firefoxbookmarks:133 unity-scope-firefoxbookmarks:
134 target_branch: lp:unity-scope-firefoxbookmarks/saucy
117 unity-scope-gdrive:135 unity-scope-gdrive:
136 target_branch: lp:unity-scope-gdrive/saucy
118 unity-scope-gmusicbrowser:137 unity-scope-gmusicbrowser:
138 target_branch: lp:unity-scope-gmusicbrowser/saucy
119 unity-scope-gourmet:139 unity-scope-gourmet:
140 target_branch: lp:unity-scope-gourmet/saucy
120 unity-scope-guayadeque:141 unity-scope-guayadeque:
142 target_branch: lp:unity-scope-guayadeque/saucy
121 unity-scope-home:143 unity-scope-home:
144 target_branch: lp:unity-scope-home/saucy
122 hooks: D00mbs_archive H05set_package_version H10enable_coverage B10gcovr_run D10install_lcov145 hooks: D00mbs_archive H05set_package_version H10enable_coverage B10gcovr_run D10install_lcov
123 archive_artifacts: '**/results/**'146 archive_artifacts: '**/results/**'
124 publish_coverage: '**/results/coverage.xml'147 publish_coverage: '**/results/coverage.xml'
125 unity-scope-launchpad:148 unity-scope-launchpad:
149 target_branch: lp:unity-scope-launchpad/saucy
126 unity-scope-manpages:150 unity-scope-manpages:
151 target_branch: lp:unity-scope-manpages/saucy
127 unity-scope-mediascanner:152 unity-scope-mediascanner:
153 target_branch: lp:unity-scope-mediascanner/saucy
128 unity-scope-musique:154 unity-scope-musique:
155 target_branch: lp:unity-scope-musique/saucy
129 unity-scope-onlinemusic:156 unity-scope-onlinemusic:
157 target_branch: lp:unity-scope-onlinemusic/saucy
130 unity-scope-openclipart:158 unity-scope-openclipart:
159 target_branch: lp:unity-scope-openclipart/saucy
131 unity-scope-sshsearch:160 unity-scope-sshsearch:
161 target_branch: lp:unity-scope-sshsearch/saucy
132 unity-scope-texdoc:162 unity-scope-texdoc:
163 target_branch: lp:unity-scope-texdoc/saucy
133 unity-scope-tomboy:164 unity-scope-tomboy:
165 target_branch: lp:unity-scope-tomboy/saucy
134 unity-scope-virtualbox:166 unity-scope-virtualbox:
167 target_branch: lp:unity-scope-virtualboz/saucy
135 unity-scope-yelp:168 unity-scope-yelp:
169 target_branch: lp:unity-scope-yelp/saucy
136 unity-scope-zotero:170 unity-scope-zotero:
171 target_branch: lp:unity-scope-zotero/saucy

Subscribers

People subscribed via source and target branches

to all changes: