Merge "Bottlenecks: add project to the docker build/push job"

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

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 5c1c58f..e7f063c 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
@@ -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:
@@ -231,6 +254,25 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'huawei-us-deploy-bare-2-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-us-deploy-bare-2
+            default-slaves:
+                - huawei-us-deploy-bare-2
+        - 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-virtual-defaults'
     parameters:
@@ -246,6 +288,50 @@
             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-sh-test-2
+            default-slaves:
+                - 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: 'huawei-sh-pod6-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-sh-pod6
+            default-slaves:
+                - huawei-sh-pod6
+        - 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:
@@ -473,3 +559,26 @@
             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'