diff options
author | meimei <meimei@huawei.com> | 2016-01-28 20:27:52 +0800 |
---|---|---|
committer | meimei <meimei@huawei.com> | 2016-01-29 15:24:50 +0800 |
commit | 9f3930c6bfe12b1179d4ec4d3b960337613ca761 (patch) | |
tree | ee725a790b36d230b135de37d4ec80a715e782d9 /jjb/compass4nfv | |
parent | f716c828d44779dbc7afa7aa8f24f20294cab1f6 (diff) |
[compass] adjust concurrency of ci daily jobs
Change-Id: I1d9c9b8f9488d3c4480e4dd5f1a164a198d4995e
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv')
-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 ea978d427..25ea676e2 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -42,8 +42,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: @@ -96,8 +101,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: |