diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-01-29 07:45:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-29 07:45:07 +0000 |
| commit | f9ab51ed8dab386e41c5e9659f9249b4b7ca7922 (patch) | |
| tree | 87778b05304cc926edd638870eda24183a12db31 | |
| parent | aa3587853b6e0e64463456abe38f45b40335401a (diff) | |
| parent | 9f3930c6bfe12b1179d4ec4d3b960337613ca761 (diff) | |
Merge "[compass] adjust concurrency of ci daily jobs"
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 16 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 13 |
2 files changed, 21 insertions, 8 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 11fac7cc7..eb9f58a84 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -58,15 +58,18 @@ - job-template: name: 'compass-{scenario}-{pod}-daily-{stream}' - node: huawei-build - - concurrent: false + concurrent: true properties: - throttle: enabled: true - max-total: 0 max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'compass-os-.*?-{pod}-daily-.*?' + - 'compass-verify-[^-]*' + block-level: 'NODE' wrappers: - build-name: @@ -131,12 +134,13 @@ properties: - throttle: enabled: true - max-total: 0 max-per-node: 1 - build-blocker: use-build-blocker: true blocking-jobs: - - 'compass-deploy-{pod}-daily-{stream}' + - 'compass-deploy-{pod}-daily-.*?' + - 'compass-verify-deploy-.*?' + block-level: 'NODE' wrappers: - build-name: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index b3d9f9e43..2f0c13329 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -44,8 +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: @@ -102,8 +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: |