summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-merge-jobs.yml7
-rw-r--r--jjb/xci/xci-verify-jobs.yml1
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index 351fe22bb..b8da6128a 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -60,12 +60,19 @@
use-build-blocker: true
blocking-jobs:
- 'xci-verify-{distro}-.*'
+ - 'xci-.*-{distro}-merge-.*'
- 'bifrost-verify-{distro}-.*'
- 'bifrost-periodic-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- 'xci-(os|k8s).*?-virtual-{distro}-.*'
block-level: 'NODE'
+ - throttle:
+ max-per-node: 2
+ max-total: 10
+ categories:
+ - xci-merge-virtual
+ option: category
wrappers:
- ssh-agent-wrapper
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 3c314568f..7c6871c22 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -66,6 +66,7 @@
use-build-blocker: true
blocking-jobs:
- 'xci-verify-{distro}-.*'
+ - 'xci-.*-{distro}-merge-.*'
- 'bifrost-verify-{distro}-.*'
- 'bifrost-periodic-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'