X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=cc196737b4ece2193278031ec345ca74668e451c;hb=470aa2a98857aa9a40167e6c84f14045351d60f1;hp=37af018bcfd6f20fc44b1b3e75616d2c021a7b90;hpb=2a3065b4bf320d58864105c35eed6417fcbdb73f;p=releng.git

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 37af018bc..cc196737b 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -39,10 +39,6 @@
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: POD_CONF_DIR
-            default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
-            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'ericsson-pod1-defaults'
@@ -85,21 +81,17 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: POD_CONF_DIR
-            default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2
-            description: 'Directory where POD configuration files are located.'
 
 - parameter:
-    name: 'intelpod2-jumphost-defaults'
+    name: 'intel-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intelpod2-jumphost
+                - intel-pod2
             default-slaves:
-                - intelpod2-jumphost
+                - intel-pod2
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -202,15 +194,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'ericsson-build-defaults'
+    name: 'huawei-build-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - ericsson-build
+                - huawei-build
             default-slaves:
-                - ericsson-build
+                - huawei-build
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -219,16 +211,17 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+
 - parameter:
-    name: 'huawei-build-defaults'
+    name: 'huawei-us-deploy-bare-1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-build
+                - huawei-us-deploy-bare-1
             default-slaves:
-                - huawei-build
+                - huawei-us-deploy-bare-1
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -239,15 +232,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-1-defaults'
+    name: 'huawei-us-deploy-bare-2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-us-deploy-bare-2
             default-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-us-deploy-bare-2
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -256,16 +249,35 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+
 - parameter:
-    name: 'huawei-deploy-vm-defaults'
+    name: 'huawei-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-deploy-vm'
+        - 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'
+
+- parameter:
+    name: 'huawei-sh-test-2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-deploy-vm
+                - huawei-sh-test-2
             default-slaves:
-                - huawei-deploy-vm
+                - huawei-sh-test-2
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-test'
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -278,15 +290,10 @@
 - parameter:
     name: 'opnfv-build-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
-            default-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build'
+            description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -297,45 +304,45 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
-    name: 'intel-us-build-1-defaults'
+    name: 'intel-build1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-us-build-1
+                - intel-build1
             default-slaves:
-                - intel-us-build-1
+                - intel-build1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'intel-us-build-2-defaults'
+    name: 'intel-build2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-us-build-2
+                - intel-build2
             default-slaves:
-                - intel-us-build-2
+                - intel-build2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'ericsson-ca-build-1-defaults'
+    name: 'intel-build3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - ericsson-ca-build-1
+                - intel-build3
             default-slaves:
-                - ericsson-ca-build-1
+                - intel-build3
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -356,6 +363,29 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'juniper-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - juniper-us-test-1
+            default-slaves:
+                - juniper-us-test-1
+        - 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'
+        - string:
+            name: CEPH_DISKS
+            default: /srv
+            description: "Disks to use by ceph (comma separated list)"
+
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:
@@ -378,10 +408,6 @@
             name: CEPH_DISKS
             default: /dev/sdb /dev/sdc
             description: "Disks to use by ceph by default (space separated list)"
-        - string:
-            name: CEPH_DISKS_CONTROLLERS
-            default: /dev/sdb
-            description: "Disks to use by ceph on controler nodes (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
@@ -407,26 +433,37 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'fuel-deploy-virtual-defaults'
+    name: 'virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-deploy-virtual'
+            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: 'intel-us-deploy-virtual-2-defaults'
+    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'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-us-deploy-virtual-2
+                - intel-virtual2
             default-slaves:
-                - intel-us-deploy-virtual-2
+                - intel-virtual2
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -439,3 +476,41 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+
+- parameter:
+    name: 'dell-us-testing-bm-1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - dell-us-testing-bm-1
+            default-slaves:
+                - dell-us-testing-bm-1
+        - 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-us-deploying-bm3-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - dell-us-deploying-bm3
+            default-slaves:
+                - dell-us-deploying-bm3
+        - 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'