cupstream2distro Configuration

Merge lp:~bregma/cupstream2distro-config/oif-raring-split into lp:cupstream2distro-config

  1. oif-raring-split
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Francis Ginther
Approved revision: 214
Merged at revision: 214
Proposed branch: lp:~bregma/cupstream2distro-config/oif-raring-split
Merge into: lp:cupstream2distro-config
Diff against target: 59 lines (+8/-12)
2 files modified
stacks/head/oif.cfg (+4/-8)
stacks/raring/oif.cfg (+4/-4)
To merge this branch: bzr merge lp:~bregma/cupstream2distro-config/oif-raring-split
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Review via email: mp+159461@code.launchpad.net

Commit message

Branched OIF projects for raring.

Description of the change

Branched OIF projects for raring.

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

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-raring-amd64-ci/121

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

review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Both .cfg files also specify the following ppa for dput'ing updates as they are autolanded:
    autolanding:
      version_string_format: "{UPSTREAM_VERSION}+r{BZR_REVISION}~{DISTRIBUTION}1"
      ppa_target: ppa:oif-team/oif-daily
      distributions: precise,quantal,raring

We don't want to dput both raring and head to the same ppa, so we either need to change the ppa_target or remove those 4 lines completely.

Also consider whether dput'ing of the head branches to oif-daily is still needed, since these projects get dput into a ubuntu-unity ppa by the daily release process.

review: Needs Fixing
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Guess its fine if it's good with CI

review: Approve
lp:~bregma/cupstream2distro-config/oif-raring-split updated
214. By Stephen M. Webb

removed autolanding stanza for oif

Revision history for this message
Stephen M. Webb (bregma) wrote :

I removed the autolanding since we no longer need a separate daily build PPA.

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

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-raring-amd64-ci/122

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

review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Complete and total awesomeness! Thanks for doing these changes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/oif.cfg'
2--- stacks/head/oif.cfg 2013-04-15 12:20:39 +0000
3+++ stacks/head/oif.cfg 2013-04-17 19:31:27 +0000
4@@ -11,10 +11,6 @@
5 autolanding_template: mbs-autolanding-config.xml.tmpl
6 hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
7 hook_source: lp:~private-ps-quality-team/+junk/oif-hooks
8- autolanding:
9- version_string_format: "{UPSTREAM_VERSION}+r{BZR_REVISION}~{DISTRIBUTION}1"
10- ppa_target: ppa:oif-team/oif-daily
11- distributions: precise,quantal,raring
12 configurations:
13 raring-amd64:
14 template: mbs-pbuilder-config.xml.tmpl
15@@ -39,6 +35,10 @@
16 testpackages: unity-autopilot
17 tests: unity.tests.test_dash.DashRevealTests.test_alt_f4_close_dash
18 projects:
19+ frame:
20+ geis:
21+ grail:
22+ libgrip:
23 to_transition:
24 evemu:
25 autolanding_template: autolanding-config.xml.tmpl
26@@ -49,7 +49,3 @@
27 template: pbuilder-config.xml.tmpl
28 raring-armhf:
29 template: pbuilder-config.xml.tmpl
30- frame:
31- geis:
32- grail:
33- libgrip:
34
35=== modified file 'stacks/raring/oif.cfg'
36--- stacks/raring/oif.cfg 2013-04-16 17:16:44 +0000
37+++ stacks/raring/oif.cfg 2013-04-17 19:31:27 +0000
38@@ -12,10 +12,6 @@
39 autolanding_template: mbs-autolanding-config.xml.tmpl
40 hooks: H05set_package_version D00mbs_archive H40enable_gensymbols_check
41 hook_source: lp:~private-ps-quality-team/+junk/oif-hooks
42- autolanding:
43- version_string_format: "{UPSTREAM_VERSION}+r{BZR_REVISION}~{DISTRIBUTION}1"
44- ppa_target: ppa:oif-team/oif-daily
45- distributions: precise,quantal,raring
46 configurations:
47 raring-amd64:
48 template: mbs-pbuilder-config.xml.tmpl
49@@ -50,6 +46,10 @@
50 raring-armhf:
51 template: pbuilder-config.xml.tmpl
52 frame:
53+ target_branch: lp:frame/raring
54 geis:
55+ target_branch: lp:geis/raring
56 grail:
57+ target_branch: lp:grail/raring
58 libgrip:
59+ target_branch: lp:libgrip/raring

Subscribers

People subscribed via source and target branches

to all changes: