Add fuel8 external network to installer params

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

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index c6078c6..e1f9e44 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -193,24 +193,6 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
-- parameter:
-    name: 'ericsson-build-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-build
-            default-slaves:
-                - ericsson-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'
 - parameter:
     name: 'huawei-build-defaults'
     parameters:
@@ -248,16 +230,13 @@
             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:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - huawei-deploy-vm
-            default-slaves:
-                - huawei-deploy-vm
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-deploy-vm'
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -270,15 +249,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
@@ -318,21 +292,6 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
-- parameter:
-    name: 'ericsson-ca-build-1-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-ca-build-1
-            default-slaves:
-                - ericsson-ca-build-1
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'zte-build-1-defaults'
     parameters:
@@ -393,10 +352,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
@@ -422,11 +377,22 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'fuel-deploy-virtual-defaults'
+    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: 'fuel-deploy-virtual'
+            default: 'ericsson-build'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT