X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=ed748aacb4ce06914a0365b3b8838380f9834dac;hb=1525a2ec04f7e592fc97d8b7d20a1870ac9312d5;hp=09fad260834c2f963cd61a3e26f4c0d0c49ddf97;hpb=9ea31fe97314f1228d115c450e724946c8b3c624;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 09fad2608..ed748aacb 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -8,31 +8,20 @@
 
     stream:
         - master:
+            slave_name: 'huawei-us-deploy-vm-1'
             branch: '{stream}'
             gs-pathname: ''
         - brahmaputra:
+            slave_name: 'huawei-us-deploy-vm-2'
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 
 
-    scenario:
-        - 'os-nosdn-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-        - 'os-odl_l2-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-        - 'os-onos-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-#        - 'os-ocl-nofeature-ha':
-#            disabled: true
-#            node: huawei-deploy-vm
-
     jobs:
         - 'compass-verify-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
+        - 'compass-verify-deploy-{stream}'
 
 
 ########################
@@ -43,8 +32,6 @@
 
     disabled: false
 
-    node: 'huawei-deploy-vm'
-
     concurrent: true
 
     wrappers:
@@ -55,8 +42,13 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 3
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-virtual-daily-.*?'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -66,18 +58,12 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
+        - 'huawei-virtual-defaults'
         - '{installer}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -96,15 +82,46 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+                    pattern: 'docs/**'
+
+    builders:
+        - trigger-builds:
+            - project: 'compass-verify-deploy-{stream}'
+              current-parameters: true
+              same-node: true
+              block: true
+
+- job-template:
+    name: 'compass-verify-deploy-{stream}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-deploy-huawei-virtual-daily-.*?'
+            block-level: 'NODE'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     builders:
         - shell:
-            !include-raw: ./compass-build.sh
+            !include-raw-escape: ./compass-build.sh
         - shell:
-            !include-raw: ./compass-deploy.sh
+            !include-raw-escape: ./compass-deploy.sh
 
     publishers:
         - archive:
@@ -115,8 +132,6 @@
 - job-template:
     name: 'compass-build-iso-{stream}'
 
-    node: ericsson-build
-
     concurrent: true
 
     properties:
@@ -131,7 +146,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
+        - 'ericsson-build-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -145,11 +160,11 @@
 
     builders:
         - shell:
-            !include-raw: ./compass-build.sh
+            !include-raw-escape: ./compass-build.sh
         - shell:
-            !include-raw: ./compass-upload-artifact.sh
+            !include-raw-escape: ./compass-upload-artifact.sh
         - shell:
-            !include-raw: ./compass-workspace-cleanup.sh
+            !include-raw-escape: ./compass-workspace-cleanup.sh
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
@@ -182,7 +197,7 @@
 
     builders:
         - shell:
-            !include-raw: ./compass-makeppa.sh
+            !include-raw-escape: ./compass-makeppa.sh