X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b967fc2d2f61e928790655dc42925b0ced3e974f;hb=daf09651a0f4e8b312ddc467600a4d04f477bdd5;hp=4af1d400e135dc0145643452b09904701c6a90cd;hpb=c704f471ad0b8629e3b2d7dcc3402e03d1795949;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 4af1d400..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}'
@@ -247,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
@@ -278,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
@@ -310,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
@@ -337,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
@@ -364,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
@@ -391,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
@@ -418,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
@@ -447,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
@@ -483,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'
@@ -539,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}'
@@ -556,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'
@@ -619,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: