jjb: xci: Add missing job blockers for XCI merge jobs

We shouldn't allow the merge jobs to run in parallel with the verify
ones when both are testing the same distro since one may wipe the
'clean VM' of the other one. Moreover, we should restrict the number of
jobs allocated on nodes in order to avoid overloading them.

Change-Id: I9c0b9b5061e41b21c01789fc4676e72e0e082f17
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index 351fe22..b8da612 100644 (file)
--- 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 3c31456..7c6871c 100644 (file)
--- 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}-.*'