From fc0bd715212a172c15c143142f44af1fc029f9f2 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 21 Jan 2020 12:27:10 +0100
Subject: [PATCH] cloud-infra: Adjust build blockers

Jobs started ending up on slaves of each other so this
change adjusts blockers to ensure this does not happen.

Change-Id: I6ee7781b344ca58c283992e52ff82f2200d820a5
---
 jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml | 2 ++
 jjb/cloud-infra/cloud-infra-periodic-engine.yaml      | 2 ++
 jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml  | 4 ++++
 jjb/cloud-infra/cloud-infra-periodic-onap.yaml        | 4 ++++
 jjb/cloud-infra/cloud-infra-periodic-openstack.yml    | 4 ++++
 jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml   | 4 ++++
 jjb/cloud-infra/cloud-infra-verify-scenario.yaml      | 2 ++
 7 files changed, 22 insertions(+)

diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index a0db3fd3f..305094637 100644
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -157,7 +157,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 15857faa0..9ee1c1b32 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -127,7 +127,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
diff --git a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
index 98472a319..e054ccdfc 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
@@ -148,9 +148,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index d3456d3ef..4af1d400e 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -180,9 +180,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 302afeeec..6d00ae2f9 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@ -166,9 +166,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index 52bf8f91f..d0669c548 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -156,9 +156,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           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 f1a4eb580..01a52d435 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -124,7 +124,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
-- 
2.25.1