X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=b46960fa762c24f08213478347600e581fcdd307;hb=b20e6f4e2e172ea33c6417733e79f8b4678be263;hp=608ce43ded76995ec58d3b869f74bba7456b0e7f;hpb=83972e1027cd1f807cad1e60a2f0f3fd49dad419;p=releng.git

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 608ce43de..b46960fa7 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -160,6 +160,10 @@
             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://jenkins-enea@gerrit.opnfv.org:29418/securedlab
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-baremetal-defaults'
     parameters:
@@ -221,6 +225,10 @@
             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://jenkins-enea@gerrit.opnfv.org:29418/securedlab
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-virtual-defaults'
     parameters:
@@ -231,16 +239,6 @@
             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
 #####################################################
@@ -380,29 +378,32 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'huawei-pod2-defaults'
+    name: 'huawei-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod2
+                - huawei-pod3
             default-slaves:
-                - huawei-pod2
+                - huawei-pod3
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-test'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'huawei-pod3-defaults'
+    name: 'huawei-pod4-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod3
+                - huawei-pod4
             default-slaves:
-                - huawei-pod3
+                - huawei-pod4
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
@@ -411,22 +412,18 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'huawei-pod4-defaults'
+    name: 'huawei-pod5-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod4
+                - huawei-pod5
             default-slaves:
-                - huawei-pod4
-        - label:
-            name: SLAVE_LABEL
-            default: 'huawei-test'
+                - huawei-pod5
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'zte-pod1-defaults'
     parameters:
@@ -596,56 +593,40 @@
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
 - parameter:
-    name: 'arm-pod1-defaults'
+    name: 'arm-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-pod1
+                - arm-pod2
             default-slaves:
-                - arm-pod1
+                - arm-pod2
         - 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
+            default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
             description: 'Base URI to the configuration directory'
 - parameter:
-    name: 'arm-pod2-defaults'
+    name: 'arm-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - arm-pod2
+                - arm-pod3
             default-slaves:
-                - arm-pod2
+                - arm-pod3
         - 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: '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
+            default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
             description: 'Base URI to the configuration directory'
 - parameter:
     name: 'intel-virtual6-defaults'
@@ -661,6 +642,24 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'ool-virtual1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - ool-virtual1
+            default-slaves:
+                - ool-virtual1
+        - 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 be used'
 #####################################################
 # These slaves are just dummy slaves for sandbox jobs
 #####################################################