X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=5136e7148d62ea376e4e5dc4b0b5d3598511decd;hb=517ffdb0536dd58f03e5c9dc596a3a10fdf207ed;hp=2acc96fd9fd27cd86272f0bad61c878e4de14010;hpb=c28d7395efcba1046721bbee724a0d93eeab7493;p=releng.git

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 2acc96fd9..5136e7148 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:
@@ -424,6 +440,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 +472,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,21 +518,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: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'cengn-pod1-defaults'
     parameters:
@@ -633,6 +662,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:
@@ -715,7 +758,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'
@@ -731,21 +774,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
@@ -864,21 +949,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:
@@ -940,6 +1010,12 @@
       - 'doctor-defaults':
           default-slave: 'doctor-fuel-verify'
 
+- parameter:
+    name: 'doctor-fuel-build-aarch64-verify-defaults'
+    parameters:
+      - 'doctor-defaults':
+          default-slave: 'doctor-fuel-build-aarch64-verify'
+
 - parameter:
     name: 'doctor-joid-verify-defaults'
     parameters: