Rename LF Jenkins slaves and update impacted jobs

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

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index cc19673..7216f7c 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,13 +1,13 @@
 - parameter:
-    name: 'opnfv-jump-1-defaults'
+    name: 'lf-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - opnfv-jump-1
+                - lf-pod1
             default-slaves:
-                - opnfv-jump-1
+                - lf-pod1
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -22,15 +22,15 @@
             description: 'SSH key to use for Apex'
 
 - parameter:
-    name: 'opnfv-jump-2-defaults'
+    name: 'lf-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - opnfv-jump-2
+                - lf-pod2
             default-slaves:
-                - opnfv-jump-2
+                - lf-pod2
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -144,7 +144,7 @@
             description: "Disks to use by ceph (comma separated list)"
         - string:
             name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.2.65.5;10.2.65.250;10.2.65.1;10.2.65.0/24
+            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)"
 
 - parameter:
@@ -171,9 +171,32 @@
             description: "Disks to use by ceph (comma separated list)"
         - string:
             name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.2.66.5;10.2.66.250;10.2.66.1;10.2.66.0/24
+            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)"
 
+- parameter:
+    name: 'intel-pod7-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'
+        - 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: 'intel-pod8-defaults'
     parameters:
@@ -213,15 +236,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-1-defaults'
+    name: 'huawei-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-pod1
             default-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-pod1
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -232,15 +255,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-2-defaults'
+    name: 'huawei-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-2
+                - huawei-pod2
             default-slaves:
-                - huawei-us-deploy-bare-2
+                - huawei-pod2
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -266,15 +289,37 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-sh-test-2-defaults'
+    name: 'huawei-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-sh-test-2
+                - huawei-pod3
             default-slaves:
-                - huawei-sh-test-2
+                - huawei-pod3
+        - 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: 'huawei-pod4-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-pod4
+            default-slaves:
+                - huawei-pod4
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
@@ -349,15 +394,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'zte-build-1-defaults'
+    name: 'zte-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - zte-build-1
+                - zte-pod1
             default-slaves:
-                - zte-build-1
+                - zte-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -370,9 +415,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - juniper-us-test-1
+                - juniper-pod1
             default-slaves:
-                - juniper-us-test-1
+                - juniper-pod1
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -393,9 +438,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-fr-pod2
+                - orange-pod2
             default-slaves:
-                - orange-fr-pod2
+                - orange-pod2
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -414,15 +459,15 @@
             description: "External network to create (name;type;first ip;last ip; gateway;network)"
 
 - parameter:
-    name: 'orange-test1-defaults'
+    name: 'orange-pod5-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - orange-test1
+                - orange-pod5
             default-slaves:
-                - orange-test1
+                - orange-pod5
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -478,15 +523,15 @@
             description: 'SSH key to use for Apex'
 
 - parameter:
-    name: 'dell-us-testing-bm-1-defaults'
+    name: 'dell-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - dell-us-testing-bm-1
+                - dell-pod1
             default-slaves:
-                - dell-us-testing-bm-1
+                - dell-pod1
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -497,15 +542,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'dell-us-deploying-bm3-defaults'
+    name: 'dell-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - dell-us-deploying-bm3
+                - dell-pod2
             default-slaves:
-                - dell-us-deploying-bm3
+                - dell-pod2
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -514,3 +559,68 @@
             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:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - 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
+            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: 'arm-build1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - arm-build1
+            default-slaves:
+                - arm-build1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+    name: 'arm-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - arm-pod1
+            default-slaves:
+                - arm-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - 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.'
+        - string:
+            name: DEPLOY_TIMEOUT
+            default: '360'
+            description: 'Deployment timeout in minutes'
+        - string:
+            name: LAB_CONFIG_URL
+            default: file://$HOME/opnfv/repos/lab-config
+            description: 'Base URI to the configuration directory'