diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2018-03-14 10:57:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-14 10:57:55 +0000 |
| commit | cb26482db39a19cbbe6f0bd9e0fa241b2ab05078 (patch) | |
| tree | ef0cf0885e0a8f3c75acfe975eb9c9706856917f | |
| parent | 7862b47133a7ec4f85cb8b3a1b8ea7452fe41bc1 (diff) | |
| parent | 7f815bbdf7f6f65ddefe89be4d925674536db1c2 (diff) | |
Merge "Update block rules on nodes"
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index a9a0da2ee..043e40fb8 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -190,8 +190,10 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'daisy.*-deploy-({pod})?-daily-.*' - 'daisy-kolla-build-.*' + - '{installer}-daily-(build|deploy|test)-(euphrates|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' block-level: 'NODE' parameters: diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index 006153f6f..c4edd7738 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -215,6 +215,13 @@ enabled: true max-total: 6 option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - '{installer}-daily-(build|deploy|test)-(euphrates|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + block-level: 'NODE' scm: - git-scm |