From af1a3488e43b27bbcb2a97bd8550608b6431064b Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 23 Aug 2016 17:35:41 -0400 Subject: [PATCH] Apex: fixes blocking between streams Change-Id: I162e51e0fd6d2d31a8c9daa08e1cc1a0678d5824 Signed-off-by: Tim Rozet --- jjb/apex/apex.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 32cbcd716..df65e9a5a 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -131,7 +131,7 @@ - 'apex-deploy.*' - 'apex-build.*' - 'apex-runner.*' - - 'apex-verify' + - 'apex-verify.*' - throttle: max-per-node: 1 max-total: 10 @@ -203,8 +203,8 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'apex-daily.*{stream}' - - 'apex-verify.*{stream}' + - 'apex-daily.*' + - 'apex-verify.*' builders: - trigger-builds: @@ -321,7 +321,7 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-deploy.*{stream}' + - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 @@ -378,7 +378,7 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-deploy.*{stream}' + - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 @@ -421,9 +421,9 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-verify.*{stream}' - - 'apex-deploy.*{stream}' - - 'apex-build.*{stream}' + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' builders: @@ -460,10 +460,10 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-verify.*{stream}' - - 'apex-deploy.*{stream}' - - 'apex-build.*{stream}' - - 'apex-runner.*{stream}' + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' + - 'apex-runner.*' triggers: - 'apex-{stream}' -- 2.16.6