cupstream2distro Configuration

Merge lp:~sil2100/cupstream2distro-config/trusty_fixes_projects into lp:cupstream2distro-config

  1. trusty_fixes_projects
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 889
Merged at revision: 890
Proposed branch: lp:~sil2100/cupstream2distro-config/trusty_fixes_projects
Merge into: lp:cupstream2distro-config
Diff against target: 27 lines (+3/-0)
1 file modified
stacks/head/qa.cfg (+3/-0)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/trusty_fixes_projects
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+192602@code.launchpad.net

Commit message

Retarget autopilot branches to 1.3 for trusty.

Description of the change

Already redeployed.

Retarget autopilot branches to 1.3 for trusty. Disable u-s-c daily-building, as now we get infinite dependency waits on the new mir, which blocks all the stacks

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

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

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

review: Needs Fixing (continuous-integration)
lp:~sil2100/cupstream2distro-config/trusty_fixes_projects updated
888. By Łukasz Zemczak

We cannot use the same target_branch for two serieses at once (it's a conflict). Try to workaround by using a 1.3-trusty series, which currently simply points to 1.3

889. By Łukasz Zemczak

Fix conflicts

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

Changed the commit message. This is fine.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/qa.cfg'
2--- stacks/head/qa.cfg 2013-10-24 09:32:24 +0000
3+++ stacks/head/qa.cfg 2013-10-25 08:50:49 +0000
4@@ -67,6 +67,7 @@
5 local_archive_pocket: trusty
6 projects:
7 autopilot:
8+ target_branch: lp:autopilot/1.3-trusty
9 contact_email: thomi.richards@canonical.com
10 configurations:
11 trusty-armhf:
12@@ -77,6 +78,7 @@
13 archive_artifacts: '**/output/*deb'
14 hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa B10pep8
15 autopilot-gtk:
16+ target_branch: lp:autopilot-gtk/1.3-trusty
17 contact_email: allan.lesage@canonical.com
18 autolanding:
19 ppa_target: ppa:autopilot/ppa
20@@ -84,6 +86,7 @@
21 use_description_for_commit: True
22 hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa
23 autopilot-qt:
24+ target_branch: lp:autopilot-qt/1.3-trusty
25 contact_email: michael.zanetti@canonical.com
26 hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa
27 ci:

Subscribers

People subscribed via source and target branches

to all changes: