From: Fatih Degirmenci Date: Fri, 6 Mar 2020 20:57:58 +0000 (+0100) Subject: cloud-infra: Drop cleanup argument X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=0a2e213dc932ba328e4b9ce8c40a8cef93f91e5f;p=infra%2Fcicd.git cloud-infra: Drop cleanup argument Cloud Infra Framework switched to clean always so dropping cleanup arguments and env vars from jobs. Change-Id: I9aa99296dd117c2c2203653f3c942bb06611b410 --- diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh index 091a6d6f..29854372 100644 --- a/jjb/cloud-infra/cloud-infra-deploy.sh +++ b/jjb/cloud-infra/cloud-infra-deploy.sh @@ -68,9 +68,9 @@ else fi if [[ $PROVISIONER_TYPE == "bifrost" ]]; then - DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF" + DEPLOY_CMD="./engine/deploy.sh -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF" elif [[ $PROVISIONER_TYPE == "heat" ]]; then - DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -u /tmp/openrc -e $HEAT_ENVIRONMENT_FILE" + DEPLOY_CMD="./engine/deploy.sh -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -u /tmp/openrc -e $HEAT_ENVIRONMENT_FILE" else echo "Error: Unsupported provisioner type. Must either be bifrost or heat!" exit 1 diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml index 30509463..df6cf145 100644 --- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml +++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml @@ -144,10 +144,6 @@ name: DELETE_STACK default: 'yes' description: 'Delete the stack upon completion of the build' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -236,7 +232,6 @@ KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -261,7 +256,6 @@ USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -345,9 +339,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'false' wrappers: - mask-passwords diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml index 9ee1c1b3..eb96cb03 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -114,10 +114,6 @@ name: YARDSTICK_DISPATCHER default: '{yardstick-dispatcher}' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -166,7 +162,6 @@ USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: FAILURE @@ -184,7 +179,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -201,7 +195,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -260,9 +253,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'false' wrappers: - build-timeout: diff --git a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml index e054ccdf..9ac1edbf 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml @@ -138,10 +138,6 @@ name: YARDSTICK_DISPATCHER default: '{yardstick-dispatcher}' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -193,7 +189,6 @@ PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: FAILURE @@ -212,7 +207,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -230,7 +224,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -248,7 +241,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -311,9 +303,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'false' wrappers: - build-timeout: diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 4af1d400..89da5a5e 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -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 diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml index 6d00ae2f..3b841229 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml +++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml @@ -156,10 +156,6 @@ name: YARDSTICK_DISPATCHER default: '{yardstick-dispatcher}' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -213,7 +209,6 @@ PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: FAILURE @@ -234,7 +229,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -254,7 +248,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -274,7 +267,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -345,9 +337,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'false' wrappers: - build-timeout: diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml index 01a52d43..9a24c3be 100644 --- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml @@ -111,10 +111,6 @@ name: TEST_SUITE default: 'healthcheck' description: 'Test suite to run' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -173,7 +169,6 @@ DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -193,7 +188,6 @@ DEPLOY_TYPE=$DEPLOY_TYPE USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE TEST_SUITE=$TEST_SUITE - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -245,9 +239,6 @@ name: TEST_REPO_URL default: 'https://gerrit.nordix.org/infra/test.git' description: 'URL to Nordix Cloud Infra test repository' - - string: - name: CLEANUP - default: 'false' wrappers: - build-timeout: diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml index 8887cf5c..21f7e9b7 100644 --- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml @@ -106,10 +106,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -155,7 +151,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -176,7 +171,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER - CLEANUP=$CLEANUP GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -228,9 +222,6 @@ name: YARDSTICK_DISPATCHER default: 'file' description: 'Dispatcher to use for Yardstick reporting' - - string: - name: CLEANUP - default: 'false' wrappers: - build-timeout: diff --git a/jjb/cloud-infra/onap-deploy.sh b/jjb/cloud-infra/onap-deploy.sh index 3c210ef3..f2faad54 100644 --- a/jjb/cloud-infra/onap-deploy.sh +++ b/jjb/cloud-infra/onap-deploy.sh @@ -67,7 +67,7 @@ fi echo "Info: Starting K8S cluster creation and ONAP deployment" echo "-------------------------------------------------------------------------" cd $WORKSPACE -./engine/deploy.sh -c -r $PROVISIONER_TYPE -u /tmp/openrc \ +./engine/deploy.sh -r $PROVISIONER_TYPE -u /tmp/openrc \ -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE cd $WORKSPACE diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml index f6ea614d..7cfac2e7 100644 --- a/jjb/cloud-infra/onap-macros.yaml +++ b/jjb/cloud-infra/onap-macros.yaml @@ -58,10 +58,7 @@ name: ENGINE_ANSIBLE_PARAMS default: '' description: 'Extra parameters that can be added when run the play books.' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' + - builder: name: 'onap-deploy-macro' builders: diff --git a/jjb/cloud-infra/scripts/spinnaker-deploy.sh b/jjb/cloud-infra/scripts/spinnaker-deploy.sh index 34e6e1e9..4f9e2de8 100644 --- a/jjb/cloud-infra/scripts/spinnaker-deploy.sh +++ b/jjb/cloud-infra/scripts/spinnaker-deploy.sh @@ -67,7 +67,7 @@ fi echo "Info: Starting K8S cluster creation and Spinnaker deployment" echo "-------------------------------------------------------------------------" cd $WORKSPACE -./engine/deploy.sh -c -r $PROVISIONER_TYPE -u /tmp/openrc \ +./engine/deploy.sh -r $PROVISIONER_TYPE -u /tmp/openrc \ -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE cd $WORKSPACE