From 54414563c2b8d41d37a18d597fe62bd2f567f3ac Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 11 Feb 2021 13:06:36 +0100 Subject: Improve blockers and params MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I63c1915654b19dd46d27e9e08d79a2cb294279c3 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes.yaml | 12 ++++++++---- jjb/functest/xtesting.yaml | 10 ++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'jjb/functest') 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 -- cgit 1.2.3-korg