Apex: fixes blocking between streams

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 32cbcd7..df65e9a 100644 (file)
--- 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}'