updates to supporting Apex build rewrite

[releng.git] / jjb / opnfv / slave-params.yml

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index daa4a4f..cc19673 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -83,15 +83,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - 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
@@ -194,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
@@ -211,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
@@ -231,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
@@ -265,17 +266,34 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'opnfv-build-defaults'
+    name: 'huawei-sh-test-2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
+                - huawei-sh-test-2
             default-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
+                - huawei-sh-test-2
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-test'
+        - 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: '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
@@ -286,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
@@ -426,26 +444,26 @@
             description: 'Git URL to use on these Jenkins Slaves'
 
 - parameter:
-    name: 'fuel-build-defaults'
+    name: 'ericsson-build-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-build'
+            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-us-deploy-virtual-2-defaults'
+    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
@@ -458,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'