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

[Łukasz Zemczak]

Retarget autopilot branches to 1.3 for trusty.

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

[PS Jenkins bot (ps-jenkins)]

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]

888. By Łukasz Zemczak on 2013-10-25

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 on 2013-10-25

Fix conflicts

[Timo Jyrinki (timo-jyrinki)]

Changed the commit message. This is fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'stacks/head/qa.cfg'
--- stacks/head/qa.cfg	2013-10-24 09:32:24 +0000
+++ stacks/head/qa.cfg	2013-10-25 08:50:49 +0000
@@ -67,6 +67,7 @@
     local_archive_pocket: trusty
   projects:
     autopilot:
+      target_branch: lp:autopilot/1.3-trusty
       contact_email: [e-mail]
       configurations:
         trusty-armhf:
@@ -77,6 +78,7 @@
         archive_artifacts: '**/output/*deb'
       hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa B10pep8
     autopilot-gtk:
+      target_branch: lp:autopilot-gtk/1.3-trusty
       contact_email: [e-mail]
       autolanding:
         ppa_target: ppa:autopilot/ppa
@@ -84,6 +86,7 @@
       use_description_for_commit: True
       hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa
     autopilot-qt:
+      target_branch: lp:autopilot-qt/1.3-trusty
       contact_email: [e-mail]
       hooks: H05set_package_version D00mbs_archive D09add_ppa~autopilot~ppa
       ci: