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
diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index a0db3fd..3050946 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 15857fa..9ee1c1b 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 98472a3..e054ccd 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 d3456d3..4af1d40 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 302afee..6d00ae2 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 52bf8f9..d0669c5 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 f1a4eb5..01a52d4 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: