[compass] create verify job as multi-jobs

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

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index f173bd9..5204f79 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -39,10 +39,6 @@
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: POD_CONF_DIR
-            default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
-            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'ericsson-pod1-defaults'
@@ -85,10 +81,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: POD_CONF_DIR
-            default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2
-            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'intelpod2-jumphost-defaults'
@@ -256,16 +248,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
@@ -430,11 +419,11 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'fuel-deploy-virtual-defaults'
+    name: 'virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-deploy-virtual'
+            default: '{installer}-deploy-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT