X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=c7ec6aa9d5f1d434f8cfadcfbeb13e7526cdee79;hb=ab40963821dfbcc5d6c1ee2190f25b1bd117d711;hp=d89af419aaa6f91a08965d04c40ce2069043f818;hpb=17b9fb9214e4796a20b1dfbda15b0013d4f97312;p=releng.git

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index d89af419a..c7ec6aa9d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,51 +1,100 @@
+#####################################################
+# Parameters for slaves using old labels
+# This will be cleaned up once the new job structure and
+# use of the new labels are in place
+#####################################################
 - parameter:
-    name: 'fuel-baremetal-defaults'
+    name: 'apex-daily-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-baremetal'
+            default: 'apex-daily-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: 'fuel-virtual-defaults'
+    name: 'apex-daily-colorado-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-virtual'
+            default: 'apex-daily-colorado'
         - 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: 'joid-baremetal-defaults'
+    name: 'apex-verify-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'joid-baremetal'
+            default: 'apex-verify-master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: CEPH_DISKS
-            default: /srv
-            description: "Disks to use by ceph (comma separated list)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
-            description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
+            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:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
+            default-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
 - parameter:
-    name: 'joid-virtual-defaults'
+    name: 'apex-verify-colorado-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'joid-virtual'
+            default: 'apex-verify-colorado'
         - 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:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
+            default-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
 - parameter:
     name: 'lf-pod1-defaults'
     parameters:
@@ -57,9 +106,22 @@
             default-slaves:
                 - lf-pod1
         - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+            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
+#####################################################
+- parameter:
+    name: 'apex-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'apex-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -68,64 +130,63 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
 - parameter:
-    name: 'lf-pod2-defaults'
+    name: 'compass-baremetal-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - lf-pod2
-            default-slaves:
-                - lf-pod2
+        - label:
+            name: SLAVE_LABEL
+            default: 'compass-baremetal'
         - string:
             name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ericsson-pod1-defaults'
+    name: 'fuel-baremetal-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod1
-            default-slaves:
-                - ericsson-pod1
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ericsson-pod2-defaults'
+    name: 'armband-baremetal-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod2
-            default-slaves:
-                - ericsson-pod2
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'intel-pod2-defaults'
+    name: 'joid-baremetal-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod2
-            default-slaves:
-                - intel-pod2
+        - label:
+            name: SLAVE_LABEL
+            default: 'joid-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+            name: EXTERNAL_NETWORK
+            default: ext-net
+            description: "External network floating ips"
+#####################################################
+# Parameters for CI virtual PODs
+#####################################################
+- parameter:
+    name: 'apex-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'apex-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -134,118 +195,121 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
 - parameter:
-    name: 'intel-pod3-defaults'
+    name: 'compass-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod3
-            default-slaves:
-                - intel-pod3
+        - label:
+            name: SLAVE_LABEL
+            default: 'compass-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'intel-pod5-defaults'
+    name: 'fuel-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod5
-            default-slaves:
-                - intel-pod5
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'armband-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-virtual'
         - string:
-            name: CEPH_DISKS
-            default: /srv
-            description: "Disks to use by ceph (comma separated list)"
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
-            description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
-
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'intel-pod6-defaults'
+    name: 'joid-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod6
-            default-slaves:
-                - intel-pod6
+        - label:
+            name: SLAVE_LABEL
+            default: 'joid-virtual'
         - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'infra-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'infra-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+#####################################################
+# Parameters for build slaves
+#####################################################
+- parameter:
+    name: 'opnfv-build-arm-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-arm'
         - string:
-            name: CEPH_DISKS
-            default: /srv
-            description: "Disks to use by ceph (comma separated list)"
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24
-            description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)"
-
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'intel-pod7-defaults'
+    name: 'opnfv-build-centos-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod7
-            default-slaves:
-                - intel-pod7
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-centos'
         - 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'
-
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
-    name: 'intel-pod8-defaults'
+    name: 'opnfv-build-ubuntu-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod8
-            default-slaves:
-                - intel-pod8
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-ubuntu'
+            description: 'Slave label on Jenkins'
         - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+            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:
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build'
+            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: 'huawei-build-defaults'
     parameters:
@@ -256,188 +320,183 @@
                 - huawei-build
             default-slaves:
                 - huawei-build
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+#####################################################
+# Parameters for none-CI PODs
+#####################################################
 - parameter:
-    name: 'huawei-pod1-defaults'
+    name: 'ericsson-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod1
+                - ericsson-pod1
             default-slaves:
-                - huawei-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - ericsson-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'huawei-pod2-defaults'
+    name: 'intel-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod2
+                - intel-pod1
             default-slaves:
-                - huawei-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - intel-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'huawei-virtual-defaults'
+    name: 'intel-pod2-defaults'
     parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'huawei-deploy-vm'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-pod2
+            default-slaves:
+                - intel-pod2
         - 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'
 - parameter:
-    name: 'huawei-pod3-defaults'
+    name: 'intel-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod3
+                - intel-pod3
             default-slaves:
-                - huawei-pod3
-        - label:
-            name: SLAVE_LABEL
-            default: 'huawei-test'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - intel-pod3
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'huawei-pod4-defaults'
+    name: 'huawei-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod4
+                - huawei-pod2
             default-slaves:
-                - huawei-pod4
-        - label:
-            name: SLAVE_LABEL
-            default: 'huawei-test'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - huawei-pod2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'opnfv-build-defaults'
+    name: 'huawei-pod3-defaults'
     parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-pod3
+            default-slaves:
+                - huawei-pod3
         - label:
             name: SLAVE_LABEL
-            default: 'opnfv-build'
-            description: 'Slave label on Jenkins'
+            default: 'huawei-test'
         - 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: 'intel-build1-defaults'
+    name: 'huawei-pod4-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-build1
+                - huawei-pod4
             default-slaves:
-                - intel-build1
+                - huawei-pod4
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-test'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
-    name: 'intel-build2-defaults'
+    name: 'zte-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-build2
+                - zte-pod1
             default-slaves:
-                - intel-build2
+                - zte-pod1
         - 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.6.2'
+            description: 'IP of the installer'
+        - string:
+            name: BRIDGE
+            default: 'br6'
+            description: 'pxe bridge for booting of Fuel master'
 - parameter:
-    name: 'intel-build3-defaults'
+    name: 'zte-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-build3
+                - zte-pod2
             default-slaves:
-                - intel-build3
+                - zte-pod2
         - 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: 'br7'
+            description: 'pxe bridge for booting of Fuel master'
 - parameter:
-    name: 'zte-pod1-defaults'
+    name: 'zte-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - zte-pod1
+                - zte-pod3
             default-slaves:
-                - zte-pod1
+                - zte-pod3
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+        - string:
+            name: BRIDGE
+            default: 'br0'
+            description: 'pxe bridge for booting of Fuel master'
 - parameter:
     name: 'juniper-pod1-defaults'
     parameters:
@@ -448,10 +507,6 @@
                 - juniper-pod1
             default-slaves:
                 - juniper-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -460,98 +515,48 @@
             name: CEPH_DISKS
             default: /srv
             description: "Disks to use by ceph (comma separated list)"
-
 - parameter:
-    name: 'orange-pod2-defaults'
+    name: 'orange-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-pod2
+                - orange-pod1
             default-slaves:
-                - orange-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - orange-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: CEPH_DISKS
-            default: /dev/sdb /dev/sdc
-            description: "Disks to use by ceph by default (space separated list)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
-            description: "External network to create (name;type;first ip;last ip; gateway;network)"
-
 - parameter:
-    name: 'orange-pod5-defaults'
+    name: 'orange-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-pod5
+                - orange-pod2
             default-slaves:
-                - orange-pod5
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - orange-pod2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
-    name: 'virtual-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: '{installer}-deploy-virtual'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
-
 - parameter:
-    name: 'ericsson-build-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'ericsson-build'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
-
-- parameter:
-    name: 'intel-virtual2-defaults'
+    name: 'orange-pod5-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-virtual2
+                - orange-pod5
             default-slaves:
-                - intel-virtual2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - orange-pod5
         - 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'
-
 - parameter:
     name: 'dell-pod1-defaults'
     parameters:
@@ -562,15 +567,10 @@
                 - dell-pod1
             default-slaves:
                 - dell-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'dell-pod2-defaults'
     parameters:
@@ -581,15 +581,10 @@
                 - dell-pod2
             default-slaves:
                 - dell-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'nokia-pod1-defaults'
     parameters:
@@ -600,10 +595,6 @@
                 - nokia-pod1
             default-slaves:
                 - nokia-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -612,45 +603,83 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
 - parameter:
-    name: 'arm-build1-defaults'
+    name: 'arm-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-build1
+                - arm-pod2
             default-slaves:
-                - arm-build1
+                - arm-pod2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'arm-pod1-defaults'
+    name: 'intel-virtual6-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-pod1
+                - intel-virtual6
             default-slaves:
-                - arm-pod1
+                - intel-virtual6
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+#####################################################
+# These slaves are just dummy slaves for sandbox jobs
+#####################################################
+- parameter:
+    name: 'sandbox-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'sandbox-baremetal'
+            description: 'Slave label on Jenkins'
         - string:
-            name: DEFAULT_BRIDGE
-            default: 'admin6_br0,public6_br0'
-            desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.'
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: DEPLOY_TIMEOUT
-            default: '360'
-            description: 'Deployment timeout in minutes'
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
+- parameter:
+    name: 'sandbox-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'sandbox-virtual'
+            description: 'Slave label on Jenkins'
         - string:
-            name: LAB_CONFIG_URL
-            default: file://$HOME/opnfv/repos/lab-config
-            description: 'Base URI to the configuration directory'
+            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: 'dummy-pod1-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'dummy-pod1'
+            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."