X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b967fc2d2f61e928790655dc42925b0ced3e974f;hb=f2b51873a346fec4e1709c4bf3e60dff76431c12;hp=878e00d5b54ecff56df317bda46a80de2160de69;hpb=ecbb1ff2be8aff80403504cfc477256660b10951;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 878e00d5..b967fc2d 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.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: '@midnight'
       - xerces:
@@ -48,7 +48,7 @@
           deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: false
+          disabled: true
           delete-stack: 'yes'
       - 'master':
           nordix-branch: master
@@ -59,7 +59,7 @@
           deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: false
+          disabled: true
           delete-stack: 'yes'
 
     distro:
@@ -119,7 +119,7 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
@@ -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
@@ -479,7 +475,7 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: 'xerces-jumphost-onap-ubuntu1804'
@@ -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:
@@ -535,7 +531,7 @@
     builders:
       - description-setter:
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
-      - '{onap-other-phases}-macro'
+      - '{onap-other-phases}-macro-legacy'
 
 - job-template:
     name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
@@ -552,7 +548,7 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: 'xerces-jumphost-onap-ubuntu1804'
@@ -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
@@ -615,6 +611,6 @@
     builders:
       - description-setter:
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
-      - 'onap-healthcheck-macro'
+      - 'onap-healthcheck-macro-legacy'
 
 # vim: set ts=2 sw=2 expandtab: