jjb: xci: Fix bifrost blockers for XCI jobs

The bifrost regexp was wrong leading to conflicts betwen the XCI
and bifrost jobs. Moreover, we need to add the same restrictions for
jobs/node on bifrost jobs similar to the XCI ones. This finally fixes
the 'throttle' property to use the 'xci-verify-virtual' category.

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

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index e4c2d0e..50b566b 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -71,7 +71,14 @@
           use-build-blocker: true
           blocking-jobs:
             - 'xci-verify-{distro}-.*'
+            - 'xci-.*-{distro}-merge-.*'
             - '.*-bifrost-verify.*-{type}'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
 
           block-level: 'NODE'
 

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index b8da612..492348d 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -61,8 +61,7 @@
           blocking-jobs:
             - 'xci-verify-{distro}-.*'
             - 'xci-.*-{distro}-merge-.*'
-            - 'bifrost-verify-{distro}-.*'
-            - 'bifrost-periodic-{distro}-.*'
+            - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
             - 'xci-(os|k8s).*?-virtual-{distro}-.*'
@@ -71,7 +70,7 @@
           max-per-node: 2
           max-total: 10
           categories:
-            - xci-merge-virtual
+            - xci-verify-virtual
           option: category
 
     wrappers:

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 7c6871c..c6b6bc4 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -67,8 +67,7 @@
           blocking-jobs:
             - 'xci-verify-{distro}-.*'
             - 'xci-.*-{distro}-merge-.*'
-            - 'bifrost-verify-{distro}-.*'
-            - 'bifrost-periodic-{distro}-.*'
+            - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
           block-level: 'NODE'