Fix build blockers due to introduction of centos support

Change-Id: I627d4bcabbb4a5e65e0f6ae10d4804b969f8c99a

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 54b16b9ea7e62a4f22901ecf95faba70787e7c94..4e0ced5297d9f2c6cceac36e3766a7413095ebb4 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -129,11 +129,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{distro}-.*'
-            - 'cloud-infra-verify-scenario-{distro}-.*'
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index a0253d4aeeb923b79bceadd682bd809c75c37f03..1aa58565368dee39035834a41e06b09b96fdcf5d 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -140,8 +140,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'k8-.*?-periodic-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index a64d69c49e1f652f708c4f29547e6b857492dabd..c4d4fe6708d049c75c6f10ae616f10ba1c1ee80c 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -125,11 +125,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{distro}-.*'
-            - 'cloud-infra-verify-scenario-{distro}-.*'
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1

diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index 5b300a5034a96aebd42d9b680d9c415ce3267bf4..e6bd0eb1eb3c69fee16cd6ad811b61d404bf9674 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -121,11 +121,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{distro}-.*'
-            - 'cloud-infra-verify-scenario-{distro}-.*'
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - '8-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1