X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=0ea37d9411b309cb5d4b1ebc452c5a3c3bfad3a9;hb=b3daaaf3d9cf201c37f68f47011fd73ac069fd1a;hp=19d5a9545060ecab3c2fc7885099beebc2bb9cf5;hpb=d7bafeb2add2600a2282b24a2c423ca696d12f42;p=releng.git

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 19d5a9545..0ea37d941 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -26,6 +26,28 @@
           default-slaves:
             - lf-pod1
 
+- parameter:
+    name: 'apex-baremetal-euphrates-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-baremetal-master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - lf-pod1
+          default-slaves:
+            - lf-pod1
+
 - parameter:
     name: 'apex-baremetal-danube-defaults'
     parameters:
@@ -73,11 +95,11 @@
             - lf-virtual3
 
 - parameter:
-    name: 'apex-virtual-danube-defaults'
+    name: 'apex-virtual-euphrates-defaults'
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'apex-virtual-danube'
+          default: 'apex-virtual-master'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -90,24 +112,33 @@
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - lf-pod3
+            - lf-virtual2
+            - lf-virtual3
           default-slaves:
-            - lf-pod3
+            - lf-virtual2
+            - lf-virtual3
 
 - parameter:
-    name: 'arm-pod5-defaults'
+    name: 'apex-virtual-danube-defaults'
     parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-danube'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - arm-pod5
+            - lf-pod3
           default-slaves:
-            - arm-pod5
-      - string:
-          name: BRIDGE
-          default: 'admin7_br0,mgmt7_br0,,public7_br0'
-          description: 'Pre-existing bridges used by Fuel'
+            - lf-pod3
 
 - parameter:
     name: 'lf-pod1-defaults'
@@ -128,21 +159,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
-- parameter:
-    name: 'lf-pod2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - lf-pod2
-          default-slaves:
-            - lf-pod2
-      - string:
-          name: BRIDGE
-          default: 'pxebr,br-ctl'
-          description: 'Pre-existing bridges used by Fuel'
-
 - parameter:
     name: 'lf-pod3-defaults'
     parameters:
@@ -474,25 +490,6 @@
 #####################################################
 # Parameters for none-CI PODs
 #####################################################
-- parameter:
-    name: 'ericsson-pod1-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - ericsson-pod1
-          default-slaves:
-            - ericsson-pod1
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.1.2'
-          description: 'IP of the installer'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'cengn-pod1-defaults'
     parameters:
@@ -719,7 +716,7 @@
       - string:
           name: BRIDGE
           default: 'br7'
-          description: 'pxe bridge for booting of Fuel master'
+          description: 'pxe bridge for booting of Daisy master'
 
 - parameter:
     name: 'zte-pod3-defaults'
@@ -735,21 +732,25 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: INSTALLER_IP
+          default: '10.20.0.2'
+          description: 'IP of the installer'
       - string:
           name: BRIDGE
           default: 'br0'
-          description: 'pxe bridge for booting of Fuel master'
+          description: 'pxe bridge for booting of Daisy master'
 
 - parameter:
-    name: zte-pod4-defaults
+    name: zte-virtual5-defaults
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - zte-pod4
+            - zte-virtual5
           default-slaves:
-            - zte-pod4
+            - zte-virtual5
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -868,21 +869,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
-- parameter:
-    name: 'arm-virtual2-defaults'
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - arm-virtual2
-          default-slaves:
-            - arm-virtual2
-      - string:
-          name: BRIDGE
-          default: ',,,public8_br0'
-          description: 'Pre-existing bridges used by Fuel'
-
 - parameter:
     name: 'intel-virtual6-defaults'
     parameters: