Ubuntu CI MaaS Services

Merge lp:~pwlars/uci-maas-services/sdk-krillin-12-arale-07 into lp:uci-maas-services

  1. sdk-krillin-12-arale-07
  2. Merge into trunk
Proposed by Paul Larson
Status: Merged
Merged at revision: 10
Proposed branch: lp:~pwlars/uci-maas-services/sdk-krillin-12-arale-07
Merge into: lp:uci-maas-services
Prerequisite: lp:~pwlars/uci-maas-services/unity8-krillin07
Diff against target: 35 lines (+18/-0)
1 file modified
devices.yaml (+18/-0)
To merge this branch: bzr merge lp:~pwlars/uci-maas-services/sdk-krillin-12-arale-07
Reviewer Review Type Date Requested Status
Canonical CI Engineering Pending
Review via email: mp+281903@code.launchpad.net

Commit message

Add krillin-12 and arale-07 for ubuntu-sdk

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'devices.yaml'
2--- devices.yaml 2016-01-07 17:33:33 +0000
3+++ devices.yaml 2016-01-07 17:33:33 +0000
4@@ -57,6 +57,15 @@
5 master_url: http://platform-qa-jenkins-be.internal:8080
6 lp_user: ci-jenkins-ro
7 lp_email: ci-jenkins-ro@lists.canonical.com
8+ arale07-slave:
9+ charm: jenkins-remote-slave
10+ branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
11+ to: adb-host
12+ options:
13+ slave_name: arale-07
14+ master_url: http://ubuntu-sdk-jenkins-be.internal:8080/ubuntu-sdk/
15+ lp_user: ci-jenkins-ro
16+ lp_email: ci-jenkins-ro@lists.canonical.com
17 mako01-slave:
18 charm: jenkins-remote-slave
19 branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
20@@ -381,6 +390,15 @@
21 master_url: http://core-apps-jenkins.staging.ubuntu.com:8080
22 lp_user: ci-jenkins-ro
23 lp_email: ci-jenkins-ro@lists.canonical.com
24+ krillin12-slave:
25+ charm: jenkins-remote-slave
26+ branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
27+ to: adb-host
28+ options:
29+ slave_name: krillin-12
30+ master_url: http://ubuntu-sdk-jenkins-be.internal:8080/ubuntu-sdk/
31+ lp_user: ci-jenkins-ro
32+ lp_email: ci-jenkins-ro@lists.canonical.com
33 krillin13-slave:
34 charm: jenkins-remote-slave
35 branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

Subscribers

People subscribed via source and target branches