Merge "Airship: add ghprbTargetBranch parameter to all jobs"

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

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 878e00d5b54ecff56df317bda46a80de2160de69..89da5a5e739233c97082885538de42d0c31a0f5b 100644 (file)
--- 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
@@ -243,7 +247,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
               kill-phase-on: NEVER
@@ -274,7 +277,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -306,7 +308,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -333,7 +334,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -360,7 +360,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -387,7 +386,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -414,7 +412,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -443,7 +440,6 @@
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -506,7 +502,7 @@
           description: 'Type of the deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Type of the deployment'
 
     wrappers:
@@ -575,7 +571,7 @@
           description: 'Type of the deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION