Merge "[compass] adjust concurrency of ci daily jobs"

diff --combined jjb/compass4nfv/compass-project-jobs.yml
index b3d9f9e,25ea676..2f0c133
--- 1/jjb/compass4nfv/compass-project-jobs.yml
--- 2/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@@ -8,11 -8,9 +8,11 @@@
  
      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}'
  
@@@ -32,9 -30,9 +32,9 @@@
  
      disabled: false
  
 -    node: 'huawei-virtual'
 +    node: '{slave_name}'
  
 -    concurrent: true
 +    concurrent: false
  
      wrappers:
          - timeout:
@@@ -44,8 -42,13 +44,13 @@@
      properties:
          - throttle:
              enabled: true
-             max-total: 4
              max-per-node: 1
+         - build-blocker:
+             use-build-blocker: true
+             blocking-jobs:
+                 - 'compass-verify-[^-]*'
+                 - 'compass-os-.*?-virtual-daily-.*?'
+             block-level: 'NODE'
  
      parameters:
          - project-parameter:
@@@ -55,15 -58,11 +60,15 @@@
          - compass-project-parameter:
              installer: '{installer}'
              gs-pathname: '{gs-pathname}'
 -        - '{node}-defaults'
 +        #- '{node}-defaults'
          - '{installer}-defaults'
          - string:
              name: DEPLOY_SCENARIO
              default: 'os-nosdn-nofeature-ha'
 +        - string:
 +            name: GIT_BASE
 +            default: https://gerrit.opnfv.org/gerrit/$PROJECT
 +            description: 'Git URL to use on this Jenkins Slave'
  
      triggers:
          - gerrit:
@@@ -102,8 -101,12 +107,12 @@@
      properties:
          - throttle:
              enabled: true
-             max-total: 0
              max-per-node: 1
+         - build-blocker:
+             use-build-blocker: true
+             blocking-jobs:
+                 - 'compass-deploy-huawei-virtual-daily-.*?'
+             block-level: 'NODE'
  
      scm:
          - gerrit-trigger-scm: