Merge lp:~fginther/uci-maas-services/mako-21-q-jenkins into lp:uci-maas-services

[Francis Ginther]

Move mako-21 to q-jenkins and update all of the ps-mako-* devices to the correct name.

Move mako-21 to q-jenkins and update all of the ps-mako-* devices to the correct name.

Note: This file still links unused devices to a jenkins. This change only updates the names of the ps-mako* devices and moves mako-21 to q-jenkins. Removing spare and not-working devices is left up to a future task.

[Joe Talbott (joetalbott)]

+1

review: Approve

=== modified file 'devices.yaml'
--- devices.yaml	2015-11-23 21:41:39 +0000
+++ devices.yaml	2015-11-24 20:02:43 +0000
@@ -201,39 +201,39 @@
                 master_url: http://q-jenkins.ubuntu-ci:8080
                 lp_user: ci-jenkins-ro
                 lp_email: [e-mail]
-        ps-mako01-slave:
-            charm: jenkins-remote-slave
-            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
-            to: adb-host
-            options:
-                slave_name: ps-mako-01
-                master_url: http://s-jenkins.ubuntu-ci:8080
-                lp_user: ci-jenkins-ro
-                lp_email: [e-mail]
-        ps-mako02-slave:
-            charm: jenkins-remote-slave
-            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
-            to: adb-host
-            options:
-                slave_name: ps-mako-02
-                master_url: http://s-jenkins.ubuntu-ci:8080
-                lp_user: ci-jenkins-ro
-                lp_email: [e-mail]
-        ps-mako03-slave:
-            charm: jenkins-remote-slave
-            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
-            to: adb-host
-            options:
-                slave_name: ps-mako-03
-                master_url: http://s-jenkins.ubuntu-ci:8080
-                lp_user: ci-jenkins-ro
-                lp_email: [e-mail]
-        ps-mako04-slave:
-            charm: jenkins-remote-slave
-            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
-            to: adb-host
-            options:
-                slave_name: ps-mako-04
+        mako21-slave:
+            charm: jenkins-remote-slave
+            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
+            to: adb-host
+            options:
+                slave_name: mako-21
+                master_url: http://q-jenkins.ubuntu-ci:8080
+                lp_user: ci-jenkins-ro
+                lp_email: [e-mail]
+        mako22-slave:
+            charm: jenkins-remote-slave
+            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
+            to: adb-host
+            options:
+                slave_name: mako-22
+                master_url: http://s-jenkins.ubuntu-ci:8080
+                lp_user: ci-jenkins-ro
+                lp_email: [e-mail]
+        mako23-slave:
+            charm: jenkins-remote-slave
+            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
+            to: adb-host
+            options:
+                slave_name: mako-23
+                master_url: http://s-jenkins.ubuntu-ci:8080
+                lp_user: ci-jenkins-ro
+                lp_email: [e-mail]
+        mako24-slave:
+            charm: jenkins-remote-slave
+            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
+            to: adb-host
+            options:
+                slave_name: mako-24
                 master_url: http://s-jenkins.ubuntu-ci:8080
                 lp_user: ci-jenkins-ro
                 lp_email: [e-mail]