[compass] create verify job as multi-jobs

Change-Id: I4bf44fbac9f3f3bb2b979696608f5d4dfce93c59
Signed-off-by: meimei <meimei@huawei.com>

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 2a82481..c50f734 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -204,16 +204,7 @@
             choices:
                 - 'trusty'
                 - 'centos7'
-- parameter:
-    name: 'huawei-virtual-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'huawei-deploy-vm'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
+
 ########################
 # trigger macros
 ########################

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 02e9102..cb94c72 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -29,7 +29,7 @@
 
     disabled: false
 
-    node: 'huawei-deploy-vm'
+    node: 'huawei-virtual'
 
     concurrent: true
 
@@ -86,6 +86,22 @@
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
 
+    builders:
+        - trigger-builds:
+            - project: 'compass-verify-deploy-{stream}'
+              current-parameters: true
+              same-node: true
+              block: true
+
+- job-template:
+    name: 'compass-verify-deploy-{stream}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw: ./compass-build.sh

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 20387f2..5204f79 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -248,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