From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 9 Dec 2015 20:26:34 +0000 (+0100)
Subject: Add all opnfv-build slaves into pod-config
X-Git-Tag: test-tag~92
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F4165%2F4;p=releng.git

Add all opnfv-build slaves into pod-config

Also set default value of controller to ODL.

Change-Id: I14e6619a15f815bb5ce8d6604061990c41060805
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---

diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index e4e04379b..94e110056 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -7,8 +7,7 @@
 
     installer: 'joid'
 
-    controller:
-        - 'odl'
+    controller: 'odl'
 
     pod: 'intel-pod5'
 
@@ -67,7 +66,8 @@
         - project-parameter:
             project: '{installer}'
         - '{pod}-defaults'
-        - '{installer}-defaults'
+        - '{installer}-defaults':
+            controller: '{controller}'
 
     scm:
         - git-scm:
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index 6bddb66c0..e62450c18 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -164,11 +164,13 @@
     parameters:
         - node:
             name: SLAVE_NAME
-            description: 'Label on Jenkins'
+            description: 'Slave name on Jenkins'
             allowed-slaves:
-                - opnfv-build
+                - intel-us-build-1
+                - ericsson-ca-build-1
             default-slaves:
-                - opnfv-build
+                - intel-us-build-1
+                - ericsson-ca-build-1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT