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
1=== modified file 'stacks/head/misc.cfg'
2--- stacks/head/misc.cfg 2013-09-27 20:49:54 +0000
3+++ stacks/head/misc.cfg 2013-10-22 05:17:06 +0000
4@@ -15,19 +15,18 @@
5 saucy-armhf:
6 node_label: calxeda-pbuilder
7 projects:
8- to_transition:
9 android-audiosystem:
10 configurations:
11 saucy-amd64: False
12 gnome-control-center-unity:
13 contact_email: francis.ginther@canonical.com
14 notify-osd:
15- cov_stream: notify-osd-13.10
16+ cov_stream: notify-osd-14.04
17 configurations:
18 generic-coverity-check:
19 template: False
20 overlay-scrollbar:
21- cov_stream: overlay-scrollbar-13.10
22+ cov_stream: overlay-scrollbar-14.04
23 configurations:
24 generic-coverity-check:
25 template: False
26@@ -36,7 +35,7 @@
27 ubuntu-themes:
28 ubuntu-wallpapers:
29 unico:
30- cov_stream: unico-13.10
31+ cov_stream: unico-14.04
32 configurations:
33 generic-coverity-check:
34 template: False
35
36=== modified file 'stacks/head/unity.cfg'
37--- stacks/head/unity.cfg 2013-10-02 12:02:12 +0000
38+++ stacks/head/unity.cfg 2013-10-22 05:17:06 +0000
39@@ -44,9 +44,8 @@
40 - hud
41 # - media # Uncomment once unity-scope-mediascanner is ready to land
42 projects:
43- to_transition:
44 compiz:
45- target_branch: lp:compiz/0.9.10
46+ target_branch: lp:compiz/0.9.11
47 build_timeout: 240
48 archive_artifacts: '**/results/**'
49 publish_coverage: '**/results/coverage.xml'
50
51=== modified file 'stacks/saucy/misc.cfg'
52--- stacks/saucy/misc.cfg 2013-09-27 20:49:54 +0000
53+++ stacks/saucy/misc.cfg 2013-10-22 05:17:06 +0000
54@@ -15,25 +15,31 @@
55 saucy-armhf:
56 node_label: calxeda-pbuilder
57 projects:
58- android-audiosystem:
59- configurations:
60- saucy-amd64: False
61 gnome-control-center-unity:
62+ target_branch: lp:gnome-control-center-unity/saucy
63 contact_email: francis.ginther@canonical.com
64 notify-osd:
65+ target_branch: lp:notify-osd/saucy
66 cov_stream: notify-osd-13.10
67 configurations:
68 generic-coverity-check:
69 template: False
70 overlay-scrollbar:
71+ target_branch: lp:overlay-toolbar/saucy
72 cov_stream: overlay-scrollbar-13.10
73 configurations:
74 generic-coverity-check:
75 template: False
76+ ubuntu-themes:
77+ target_branch: lp:ubuntu-themes/saucy
78+ ubuntu-wallpapers:
79+ target_branch: lp:ubuntu-wallpapers/saucy
80+ to_remove:
81+ android-audiosystem:
82+ configurations:
83+ saucy-amd64: False
84 phablet-tools:
85 contact_email: sergio.schvezov@canonical.com
86- ubuntu-themes:
87- ubuntu-wallpapers:
88 unico:
89 cov_stream: unico-13.10
90 configurations:
91
92=== modified file 'stacks/saucy/unity.cfg'
93--- stacks/saucy/unity.cfg 2013-10-02 12:02:12 +0000
94+++ stacks/saucy/unity.cfg 2013-10-22 05:17:06 +0000
95@@ -45,7 +45,7 @@
96 # - media # Uncomment once unity-scope-mediascanner is ready to land
97 projects:
98 compiz:
99- target_branch: lp:compiz/0.9.10
100+ target_branch: lp:compiz/saucy
101 build_timeout: 240
102 archive_artifacts: '**/results/**'
103 publish_coverage: '**/results/coverage.xml'
104@@ -61,8 +61,11 @@
105 saucy-armhf:
106 hooks: D00mbs_archive H15enable_testing D10install_google_test B09googletests_cmake D10install_valgrind
107 libunity:
108+ target_branch: lp:libunity/saucy
109 libunity-misc:
110+ target_branch: lp:libunity-misc/saucy
111 nux:
112+ target_branch: lp:nux/saucy
113 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
114 archive_artifacts: '**/results/**'
115 publish_coverage: '**/results/coverage.xml'
116@@ -71,6 +74,7 @@
117 saucy-armhf:
118 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results
119 unity:
120+ target_branch: lp:unity/saucy
121 build_timeout: 240
122 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
123 archive_artifacts: '**/results/**'
124@@ -80,7 +84,9 @@
125 saucy-armhf:
126 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
127 unity-asset-pool:
128+ target_branch: lp:unity-asset-pool/saucy
129 unity-lens-applications:
130+ target_branch: lp:unity-lens-applications/saucy
131 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
132 configurations:
133 saucy-armhf:
134@@ -89,8 +95,11 @@
135 archive_artifacts: '**/results/**'
136 publish_coverage: '**/results/coverage.xml'
137 unity-lens-files:
138+ target_branch: lp:unity-lens-files/saucy
139 unity-lens-friends:
140+ target_branch: lp:unity-lens-friends/saucy
141 unity-lens-music:
142+ target_branch: lp:unity-lens-music/saucy
143 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
144 configurations:
145 saucy-armhf:
146@@ -99,7 +108,9 @@
147 archive_artifacts: '**/results/**'
148 publish_coverage: '**/results/coverage.xml'
149 unity-lens-photos:
150+ target_branch: lp:unity-lens-photos/saucy
151 unity-lens-video:
152+ target_branch: lp:unity-lens-video/saucy
153 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
154 configurations:
155 saucy-armhf:
156@@ -108,29 +119,53 @@
157 archive_artifacts: '**/results/**'
158 publish_coverage: '**/results/coverage.xml'
159 unity-scope-audacious:
160+ target_branch: lp:unity-scope-audacious/saucy
161 unity-scope-chromiumbookmarks:
162+ target_branch: lp:unity-scope-chromiumbookmarks/saucy
163 unity-scope-calculator:
164+ target_branch: lp:unity-scope-calculator/saucy
165 unity-scope-clementine:
166+ target_branch: lp:unity-scope-clementine/saucy
167 unity-scope-colourlovers:
168+ target_branch: lp:unity-scope-colourlovers/saucy
169 unity-scope-devhelp:
170+ target_branch: lp:unity-scope-devhelp/saucy
171 unity-scope-firefoxbookmarks:
172+ target_branch: lp:unity-scope-firefoxbookmarks/saucy
173 unity-scope-gdrive:
174+ target_branch: lp:unity-scope-gdrive/saucy
175 unity-scope-gmusicbrowser:
176+ target_branch: lp:unity-scope-gmusicbrowser/saucy
177 unity-scope-gourmet:
178+ target_branch: lp:unity-scope-gourmet/saucy
179 unity-scope-guayadeque:
180+ target_branch: lp:unity-scope-guayadeque/saucy
181 unity-scope-home:
182+ target_branch: lp:unity-scope-home/saucy
183 hooks: D00mbs_archive H05set_package_version H10enable_coverage B10gcovr_run D10install_lcov
184 archive_artifacts: '**/results/**'
185 publish_coverage: '**/results/coverage.xml'
186 unity-scope-launchpad:
187+ target_branch: lp:unity-scope-launchpad/saucy
188 unity-scope-manpages:
189+ target_branch: lp:unity-scope-manpages/saucy
190 unity-scope-mediascanner:
191+ target_branch: lp:unity-scope-mediascanner/saucy
192 unity-scope-musique:
193+ target_branch: lp:unity-scope-musique/saucy
194 unity-scope-onlinemusic:
195+ target_branch: lp:unity-scope-onlinemusic/saucy
196 unity-scope-openclipart:
197+ target_branch: lp:unity-scope-openclipart/saucy
198 unity-scope-sshsearch:
199+ target_branch: lp:unity-scope-sshsearch/saucy
200 unity-scope-texdoc:
201+ target_branch: lp:unity-scope-texdoc/saucy
202 unity-scope-tomboy:
203+ target_branch: lp:unity-scope-tomboy/saucy
204 unity-scope-virtualbox:
205+ target_branch: lp:unity-scope-virtualboz/saucy
206 unity-scope-yelp:
207+ target_branch: lp:unity-scope-yelp/saucy
208 unity-scope-zotero:
209+ target_branch: lp:unity-scope-zotero/saucy

Subscribers

People subscribed via source and target branches

to all changes: