add ool-virtual2 and ool-virtual3

This patch adds two pods deployed by fuel and joid,
also adds non-voting jobs on fuel pod (ool-virtual2).

Change-Id: I5dbadbbeaebf75bb27930233d2609adbc2757ca5
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 62f89e6..9b31cc2 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -19,6 +19,13 @@
         - apex:
             slave-label: 'ool-virtual1'
             pod: 'ool-virtual1'
+        - fuel:
+            slave-label: 'ool-virtual2'
+            pod: 'ool-virtual2'
+        # TODO(r-mibu): enable this once joid is ready
+        #- joid:
+        #    slave-label: 'ool-virtual3'
+        #    pod: 'ool-virtual3'
 
     inspector:
         - 'sample'
@@ -34,7 +41,7 @@
 
     jobs:
         - 'doctor-verify-{stream}'
-        - 'doctor-{task}-{installer}-{inspector}-{stream}':
+        - 'doctor-{task}-{installer}-{inspector}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 23ddbf8..57bb8bd 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -683,15 +683,17 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ool-virtual1-defaults'
+    name: 'ool-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
                 - ool-virtual1
+                - ool-virtual2
+                - ool-virtual3
             default-slaves:
-                - ool-virtual1
+                - '{default-slave}'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -700,6 +702,21 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to be used'
+- parameter:
+    name: 'ool-virtual1-defaults'
+    parameters:
+        - 'ool-defaults':
+            default-slave: 'ool-virtual1'
+- parameter:
+    name: 'ool-virtual2-defaults'
+    parameters:
+        - 'ool-defaults':
+            default-slave: 'ool-virtual2'
+- parameter:
+    name: 'ool-virtual3-defaults'
+    parameters:
+        - 'ool-defaults':
+            default-slave: 'ool-virtual3'
 - parameter:
     name: 'multisite-virtual-defaults'
     parameters: