summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-03-29 16:15:38 -0400
committerTim Rozet <trozet@redhat.com>2016-03-29 16:15:38 -0400
commit4c07805caa3c3e1f3d01cb830ba3486ba3176665 (patch)
tree4fb49fa2885bd59ab2f78f09a9a2a9e89295450d
parent77af29fb9ef9c93524f72eb1479b098b377fd8b2 (diff)
Apex: fixes job blocking
Issue where master is blocking brahmaputra even though they are on separate PODs. Change-Id: I7f8721162b2d45f6b17c6657552c5288dfa1f26f Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yml50
1 files changed, 25 insertions, 25 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 0685a6389..e98e3f94a 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -110,11 +110,11 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-daily.*"
- - "apex-deploy.*"
- - "apex-build.*"
- - "apex-runner.*"
- - 'apex-verify-{block-stream}'
+ - 'apex-daily.*{stream2}'
+ - 'apex-deploy.*{stream2}'
+ - 'apex-build.*{stream2}'
+ - 'apex-runner.*{stream2}'
+ - 'apex-verify-{stream2}'
builders:
- 'apex-build'
@@ -204,11 +204,11 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-daily.*"
- - "apex-deploy.*"
- - "apex-build.*"
- - "apex-runner.*"
- - 'apex-verify-{block-stream}'
+ - 'apex-daily.*{stream1}'
+ - 'apex-deploy.*{stream1}'
+ - 'apex-build.*{stream1}'
+ - 'apex-runner.*{stream1}'
+ - 'apex-verify-{stream1}'
builders:
- 'apex-build'
@@ -252,8 +252,8 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-daily.*"
- - "apex-verify.*"
+ - 'apex-daily.*{stream}'
+ - 'apex-verify.*{stream}'
builders:
- trigger-builds:
@@ -315,7 +315,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-deploy.*"
+ - 'apex-deploy.*{stream}'
builders:
- 'apex-build'
@@ -364,7 +364,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-deploy.*"
+ - 'apex-deploy.*{stream}'
builders:
- 'apex-deploy-virtual'
@@ -402,9 +402,9 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-verify.*"
- - "apex-deploy.*"
- - "apex-build.*"
+ - 'apex-verify.*{stream}'
+ - 'apex-deploy.*{stream}'
+ - 'apex-build.*{stream}'
builders:
@@ -440,10 +440,10 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-verify.*"
- - "apex-deploy.*"
- - "apex-build.*"
- - "apex-runner.*"
+ - 'apex-verify.*{stream2}'
+ - 'apex-deploy.*{stream2}'
+ - 'apex-build.*{stream2}'
+ - 'apex-runner.*{stream2}'
triggers:
- 'apex-{stream2}'
@@ -557,10 +557,10 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "apex-verify.*"
- - "apex-deploy.*"
- - "apex-build.*"
- - "apex-runner.*"
+ - 'apex-verify.*{stream1}'
+ - 'apex-deploy.*{stream1}'
+ - 'apex-build.*{stream1}'
+ - 'apex-runner.*{stream1}'
triggers:
- 'apex-{stream1}'