X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=c7ec6aa9d5f1d434f8cfadcfbeb13e7526cdee79;hb=ab40963821dfbcc5d6c1ee2190f25b1bd117d711;hp=641ae4e515bd32049899902111c5cbb6a1e02991;hpb=0b6595dfff8c4cd29a874fc6e697b63e0b57c92e;p=releng.git

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 641ae4e51..c7ec6aa9d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -17,6 +17,34 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - lf-pod1
+            default-slaves:
+                - lf-pod1
+- parameter:
+    name: 'apex-daily-colorado-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'apex-daily-colorado'
+        - 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'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - lf-pod1
+            default-slaves:
+                - lf-pod1
 - parameter:
     name: 'apex-verify-master-defaults'
     parameters:
@@ -31,6 +59,42 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
+            default-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
+- parameter:
+    name: 'apex-verify-colorado-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'apex-verify-colorado'
+        - 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'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
+            default-slaves:
+                - intel-virtual3
+                - intel-virtual4
+                - intel-virtual5
 - parameter:
     name: 'lf-pod1-defaults'
     parameters:
@@ -86,6 +150,20 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'armband-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-baremetal-defaults'
     parameters:
@@ -96,14 +174,10 @@
             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)"
         - string:
             name: EXTERNAL_NETWORK
-            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)"
+            default: ext-net
+            description: "External network floating ips"
 #####################################################
 # Parameters for CI virtual PODs
 #####################################################
@@ -141,6 +215,20 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'armband-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-virtual-defaults'
     parameters:
@@ -151,6 +239,16 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'infra-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'infra-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 #####################################################
 # Parameters for build slaves
 #####################################################
@@ -197,6 +295,21 @@
             name: BUILD_DIRECTORY
             default: $WORKSPACE/build_output
             description: "Directory where the build artifact will be located upon the completion of the build."
+- 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
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 - parameter:
     name: 'huawei-build-defaults'
     parameters:
@@ -402,6 +515,20 @@
             name: CEPH_DISKS
             default: /srv
             description: "Disks to use by ceph (comma separated list)"
+- parameter:
+    name: 'orange-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - orange-pod1
+            default-slaves:
+                - orange-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:
@@ -416,14 +543,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: CEPH_DISKS
-            default: /dev/sdb /dev/sdc
-            description: "Disks to use by ceph by default (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
-            description: "External network to create (name;type;first ip;last ip; gateway;network)"
 - parameter:
     name: 'orange-pod5-defaults'
     parameters:
@@ -484,32 +603,6 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-- 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: ssh://git@git.enea.com/pharos/lab-config
-            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'arm-pod2-defaults'
     parameters:
@@ -524,14 +617,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: DEFAULT_BRIDGE
-            default: 'admin_br0,public_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: ssh://git@git.enea.com/pharos/lab-config