ci-core-jenkins

Merge lp:~fginther/ci-core-jenkins/switch-to-edge into lp:ci-core-jenkins

  1. switch-to-edge
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Celso Providelo
Approved revision: 12
Merged at revision: 12
Proposed branch: lp:~fginther/ci-core-jenkins/switch-to-edge
Merge into: lp:ci-core-jenkins
Diff against target: 37 lines (+5/-4)
2 files modified
README.rst (+4/-3)
core-jenkins-service.conf (+1/-1)
To merge this branch: bzr merge lp:~fginther/ci-core-jenkins/switch-to-edge
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+257208@code.launchpad.net

Commit message

Switch to the edge channel.

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-03-31 18:16:08 +0000
3+++ README.rst 2015-04-23 02:35:17 +0000
4@@ -51,7 +51,7 @@
5 ===============
6
7 [image]
8-url = http://system-image.ubuntu.com/ubuntu-core/devel-proposed/generic_amd64/index.json
9+url = http://system-image.ubuntu.com/ubuntu-core/rolling/edge/generic_amd64/index.json
10 result_url = https://objectstorage.prodstack4.canonical.com/v1/AUTH_c2754fa48b0f42a4822aafe97139e153
11 retry_count = 240
12
13@@ -65,10 +65,11 @@
14 ./setup-jobs.py -j http://q-jenkins.ubuntu-ci:8080 -u <user_name> \
15 -p <password> -b lp:ci-core-jenkins
16
17-- The same as above, but to run for devel and generic_i386::
18+- The same as above, but to run for rolling_edge and generic_i386::
19
20 ./setup-jobs.py -j http://q-jenkins.ubuntu-ci:8080 -u <user_name> \
21- -p <password> -c devel --device-type generic_i386 -b lp:ci-core-jenkins
22+ -p <password> -c rolling_edge --device-type generic_i386 \
23+ -b lp:ci-core-jenkins
24
25 For detailed information about each parameter and default values, please have a look
26 at the ouput of ``setup-jobs -h``.
27
28=== modified file 'called-by-tarmac.py' (properties changed: -x to +x)
29=== modified file 'core-jenkins-service.conf'
30--- core-jenkins-service.conf 2015-04-08 11:23:59 +0000
31+++ core-jenkins-service.conf 2015-04-23 02:35:17 +0000
32@@ -1,4 +1,4 @@
33 [image]
34-url = http://system-image.ubuntu.com/ubuntu-core/devel-proposed/generic_amd64/index.json
35+url = http://system-image.ubuntu.com/ubuntu-core/rolling/edge/generic_amd64/index.json
36 result_url = https://objectstorage.prodstack4.canonical.com/v1/AUTH_07e2f90306544024af4e362c6bf56aff
37 retry_count = 240

Subscribers

People subscribed via source and target branches