X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=4902dcfc5d263afc1d6daa5fa5e8161d6b19071d;hb=6f0824a9be109b7a657ff2595b350fe7ea6275e2;hp=19d5a9545060ecab3c2fc7885099beebc2bb9cf5;hpb=bb22c8c02df3e9d030ff64c304536c31b78a37a6;p=releng.git

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 19d5a9545..4902dcfc5 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:
@@ -72,6 +94,30 @@
             - lf-virtual2
             - lf-virtual3
 
+- parameter:
+    name: 'apex-virtual-euphrates-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-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-virtual2
+            - lf-virtual3
+          default-slaves:
+            - lf-virtual2
+            - lf-virtual3
+
 - parameter:
     name: 'apex-virtual-danube-defaults'
     parameters:
@@ -95,30 +141,34 @@
             - lf-pod3
 
 - parameter:
-    name: 'arm-pod5-defaults'
+    name: 'lf-pod1-defaults'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - arm-pod5
+            - lf-pod1
           default-slaves:
-            - arm-pod5
+            - lf-pod1
       - string:
-          name: BRIDGE
-          default: 'admin7_br0,mgmt7_br0,,public7_br0'
-          description: 'Pre-existing bridges used by Fuel'
+          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'
 
 - parameter:
-    name: 'lf-pod1-defaults'
+    name: 'lf-pod3-defaults'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - lf-pod1
+            - lf-pod3
           default-slaves:
-            - lf-pod1
+            - lf-pod3
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -129,30 +179,34 @@
           description: 'SSH key to use for Apex'
 
 - parameter:
-    name: 'lf-pod2-defaults'
+    name: 'lf-pod4-defaults'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - lf-pod2
+            - lf-pod4
           default-slaves:
-            - lf-pod2
+            - lf-pod4
       - string:
-          name: BRIDGE
-          default: 'pxebr,br-ctl'
-          description: 'Pre-existing bridges used by Fuel'
+          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'
 
 - parameter:
-    name: 'lf-pod3-defaults'
+    name: 'lf-pod5-defaults'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - lf-pod3
+            - lf-pod5
           default-slaves:
-            - lf-pod3
+            - lf-pod5
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -424,6 +478,22 @@
           default: $WORKSPACE/build_output
           description: "Directory where the build artifact will be located upon the completion of the build."
 
+- parameter:
+    name: 'pharos-dashboard-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'pharos-dashboard'
+          description: 'Slave label on Jenkins'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - parameter:
     name: 'opnfv-build-defaults'
     parameters:
@@ -440,6 +510,18 @@
           default: $WORKSPACE/build_output
           description: "Directory where the build artifact will be located upon the completion of the build."
 
+- parameter:
+    name: 'ericsson-build3-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'ericsson-build3'
+          description: 'Slave label on Jenkins'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
 - parameter:
     name: 'huawei-build-defaults'
     parameters:
@@ -474,25 +556,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:
@@ -637,6 +700,20 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
 
+- parameter:
+    name: 'intel-pod17-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod17
+          default-slaves:
+            - intel-pod17
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+
 - parameter:
     name: 'huawei-virtual5-defaults'
     parameters:
@@ -719,7 +796,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 +812,63 @@
           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-pod9-defaults'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - zte-pod4
+            - zte-pod9
           default-slaves:
-            - zte-pod4
+            - zte-pod9
+      - string:
+          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.7.2'
+          description: 'IP of the installer'
+      - string:
+          name: BRIDGE
+          default: 'br0'
+          description: 'pxe bridge for booting of Daisy master'
+
+- parameter:
+    name: zte-virtual5-defaults
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - zte-virtual5
+          default-slaves:
+            - zte-virtual5
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+    name: zte-virtual6-defaults
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - zte-virtual6
+          default-slaves:
+            - zte-virtual6
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -868,21 +987,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:
@@ -914,15 +1018,19 @@
           description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'doctor-defaults'
+    name: 'doctor-slave-parameter'
     parameters:
       - node:
           name: SLAVE_NAME
           description: 'Slave name on Jenkins'
           allowed-slaves:
-            - '{default-slave}'
+            - 'doctor-apex-x86_64'
+            - 'doctor-fuel-x86_64'
+            - 'doctor-fuel-aarch64'
+            - 'doctor-joid-x86_64'
+            - 'not-specified'
           default-slaves:
-            - '{default-slave}'
+            - 'not-specified'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -932,24 +1040,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to be used'
 
-- parameter:
-    name: 'doctor-apex-verify-defaults'
-    parameters:
-      - 'doctor-defaults':
-          default-slave: 'doctor-apex-verify'
-
-- parameter:
-    name: 'doctor-fuel-verify-defaults'
-    parameters:
-      - 'doctor-defaults':
-          default-slave: 'doctor-fuel-verify'
-
-- parameter:
-    name: 'doctor-joid-verify-defaults'
-    parameters:
-      - 'doctor-defaults':
-          default-slave: 'doctor-joid-verify'
-
 - parameter:
     name: 'multisite-virtual-defaults'
     parameters: