From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 9 May 2019 13:21:22 +0000 (+0200)
Subject: Fix build blockers due to introduction of centos support
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=175d55d67c5e93307acc66fd6f661118d3dbb6f0;p=infra%2Fcicd.git

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 54b16b9ea..4e0ced529 100644
--- 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 a0253d4ae..1aa585653 100644
--- 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 a64d69c49..c4d4fe670 100644
--- 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 5b300a503..e6bd0eb1e 100644
--- 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