diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-05-26 02:17:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-26 02:17:44 +0000 |
| commit | b02bc03691fda71399390a69ca1b056ce6bd7eac (patch) | |
| tree | b6dcddbf371f96d5e775196da942aa8ea8309490 /jjb/daisy4nfv | |
| parent | 52cd700a0f32493f9b6317c265151c72c3c1de9c (diff) | |
| parent | ccedc259af9779e19f7f42b2c8c53b5c8b0dcbb6 (diff) | |
Merge "update blocked jobs"
Diffstat (limited to 'jjb/daisy4nfv')
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 14 |
2 files changed, 20 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 9e7b867af..48620fd58 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -54,6 +54,11 @@ enabled: true max-total: 4 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{alias}-merge-(master|danube)' + block-level: 'NODE' scm: - git-scm @@ -148,7 +153,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-(master|danube)' + - '{alias}-merge-{phase}-.*' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index 6335c33a2..aac7d407c 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -47,6 +47,12 @@ enabled: true max-total: 4 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{installer}-merge-build-.*' + block-level: 'NODE' + scm: - git-scm-gerrit wrappers: @@ -138,6 +144,13 @@ enabled: true max-total: 6 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{installer}-merge-build-.*' + - '{alias}-verify-build-.*' + block-level: 'NODE' + scm: - git-scm-gerrit wrappers: @@ -152,6 +165,7 @@ - '{slave-label}-defaults' - '{alias}-verify-defaults': gs-pathname: '{gs-pathname}' + builders: - description-setter: description: "Built on $NODE_NAME" |