X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=cdc08eaf4852bfe0b938c6e543b6979461d3381b;hb=98e320861631af57c903d7dc18aa9cbae6afa8a0;hp=fc89f143bfe9c2abcc0f80fa3364a863a7b02bed;hpb=97676a4b0bea0ac986f1059feb57b1cb1405e2d1;p=releng.git

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index fc89f143b..cdc08eaf4 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -4,11 +4,11 @@
 # use of the new labels are in place
 #####################################################
 - parameter:
-    name: 'apex-daily-master-defaults'
+    name: 'apex-baremetal-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-daily-master'
+            default: 'apex-baremetal-master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -25,11 +25,11 @@
             default-slaves:
                 - lf-pod1
 - parameter:
-    name: 'apex-daily-danube-defaults'
+    name: 'apex-baremetal-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-daily-danube'
+            default: 'apex-baremetal-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -46,11 +46,11 @@
             default-slaves:
                 - lf-pod1
 - parameter:
-    name: 'apex-verify-master-defaults'
+    name: 'apex-virtual-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-verify-master'
+            default: 'apex-virtual-master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -63,19 +63,18 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-virtual3
-                - intel-virtual4
-                - intel-virtual5
+                - lf-virtual2
+                - lf-virtual3
             default-slaves:
-                - intel-virtual3
-                - intel-virtual4
-                - intel-virtual5
+                - lf-virtual2
+                - lf-virtual3
+
 - parameter:
-    name: 'apex-verify-danube-defaults'
+    name: 'apex-virtual-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-verify-danube'
+            default: 'apex-virtual-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -88,13 +87,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-virtual3
-                - intel-virtual4
-                - intel-virtual5
+                - lf-pod3
             default-slaves:
-                - intel-virtual3
-                - intel-virtual4
-                - intel-virtual5
+                - lf-pod3
 - parameter:
     name: 'lf-pod1-defaults'
     parameters:
@@ -113,6 +108,24 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+- parameter:
+    name: 'lf-pod3-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - lf-pod3
+            default-slaves:
+                - lf-pod3
+        - 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'
 #####################################################
 # Parameters for CI baremetal PODs
 #####################################################
@@ -191,6 +204,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-baremetal'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -270,6 +287,14 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-virtual'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
+        - string:
+            name: BRIDGE
+            default: 'daisy1'
+            description: 'pxe bridge for booting of Fuel master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -580,7 +605,7 @@
             description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: INSTALLER_IP
-            default: '10.20.7.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: BRIDGE
@@ -747,15 +772,15 @@
             default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
             description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'arm-pod3-2-defaults'
+    name: 'arm-pod4-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-pod3-2
+                - arm-pod4
             default-slaves:
-                - arm-pod3-2
+                - arm-pod4
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT