diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-10-04 16:09:17 -0400 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2018-10-12 11:52:12 -0400 |
| commit | 6a2f75928ca54b0566ac116ec608cd4a37c23227 (patch) | |
| tree | 8f27737262405b0f4c023d064dc9e786bcb42935 /jjb/daisy4nfv | |
| parent | f63d4bda4c6dd54d22991b7577df7f885a95f90f (diff) | |
Update jenkins-job-builder to 2.2.1
jjb/lf-ci-jobs.yaml has jjb-version: 2.2.1 as a minimum
change block-level to blocking-level:
https://review.openstack.org/#/c/608092/
We will need to change this back once we move past
jenkins-job-builder>2.5.0
Change-Id: I12d0f55ee3c2dad20340ebf0fa8428ee1ad8484c
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Diffstat (limited to 'jjb/daisy4nfv')
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yaml b/jjb/daisy4nfv/daisy-daily-jobs.yaml index ba03bc3f2..4a7e6e908 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yaml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yaml @@ -105,7 +105,7 @@ - 'daisy-os-.*?-{pod}-daily-.*?' - 'daisy-daily-.*' - 'daisy-kolla-build-.*' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - build-name: @@ -191,7 +191,7 @@ - '{installer}-(build|deploy|test)-daily-(fraser|master)' - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' - block-level: 'NODE' + blocking-level: 'NODE' parameters: - project-parameter: diff --git a/jjb/daisy4nfv/daisy-project-jobs.yaml b/jjb/daisy4nfv/daisy-project-jobs.yaml index ec5ba71f2..791454820 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yaml +++ b/jjb/daisy4nfv/daisy-project-jobs.yaml @@ -60,7 +60,7 @@ - '{installer}-kolla-build-.*' - 'daisy-deploy-.*' - 'daisy-daily-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm @@ -129,7 +129,7 @@ - '{installer}-kolla-build-.*' - 'daisy4nfv-merge-build-.*' - 'daisy4nfv-verify-build-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm @@ -221,7 +221,7 @@ - '{installer}-daily-(build|deploy|test)-(fraser|master)' - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml index 7e03fabaf..c261c23bc 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml @@ -61,7 +61,7 @@ use-build-blocker: true blocking-jobs: - '{alias}-merge-(master|fraser)' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm @@ -158,7 +158,7 @@ blocking-jobs: - '{alias}-merge-{phase}-.*' - '{installer}-daily-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml index 033beeb6d..c8c1db096 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml @@ -55,7 +55,7 @@ use-build-blocker: true blocking-jobs: - '{alias}-merge-build-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm-gerrit @@ -158,7 +158,7 @@ - '{alias}-merge-build-.*' - '{alias}-verify-build-.*' - '{installer}-daily-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm-gerrit |