diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 12 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index e3adeb6d1..975bfa121 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -405,7 +405,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-{tag}-(daily|review)$' + - '^functest-kubernetes-{tag}-(daily|docker|review)$' builders: - multijob: name: remove former images @@ -684,7 +684,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-{tag}-(daily|review)$' + - '^functest-kubernetes-{tag}-(daily|docker|review)$' builders: - multijob: name: remove former images @@ -879,8 +879,12 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' - - functest-kubernetes-DEPLOY_SCENARIO: - DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^functest-kubernetes-{tag}-(daily|docker|review)$' builders: - multijob: name: remove dependency diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index c9b37a8dc..1c12a1a7f 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -294,7 +294,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^xtesting-{tag}-(daily|review)$' + - '^xtesting-{tag}-(daily|docker|review)$' builders: - multijob: name: remove former images @@ -500,7 +500,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^xtesting-{tag}-(daily|review)$' + - '^xtesting-{tag}-(daily|docker|review)$' builders: - multijob: name: remove former images @@ -616,6 +616,12 @@ parameters: - xtesting-slave: slave: '{slave}' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^xtesting-{tag}-(daily|docker|review)$' builders: - multijob: name: remove dependency |