engine: Abort job if dependency job did not succeed

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-spinnaker.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index 52bf8f91fb17615b6157e0fc43ebf04ab1a630f1..cde504b45fcef77351db6c0cfcf59eb33e87bf73 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -30,7 +30,7 @@
 
     cloud:
       - city:
-          slave-label: 'city-jumphost-ubuntu1804'
+          slave-label: 'engine-jumphost-online-ubuntu1804'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
           daily-trigger: '@daily'
 
@@ -43,7 +43,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
-          disabled: false
+          disabled: true
           delete-stack: 'yes'
 
     distro:
@@ -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