From b7f2cbb7244491831f416abcf5d6a5439761ce1b Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Thu, 25 Apr 2019 10:15:33 +0400 Subject: [PATCH] All full cleanup to swarm jobs Change-Id: I76d3868c7e4b7710b56fd04ef7cb299c709b028f --- maintenance-ci/mos/macroses/9x-systest-params.yaml | 5 +++++ maintenance-ci/mos/scripts/fuel_qa_launch_test.sh | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml index 706f094..4d874e1 100644 --- a/maintenance-ci/mos/macroses/9x-systest-params.yaml +++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml @@ -5,6 +5,11 @@ - bool: name: DELETE_ENV_BEFORE_RUN default: false + description: "Delete only used env (9.x_virtual_lab+ENV_NAME_SUFFIX)" + - bool: + name: CLEANUP_ALL_BEFORE_RUN + default: false + description: "Delete ALL envs before run (for swarm run)" - string: name: SNAPSHOT_PARAMS_ID default: lastSuccessfulBuild diff --git a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh index a3fc870..34ead94 100644 --- a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh +++ b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh @@ -46,7 +46,12 @@ fi source "${VENV_PATH}/bin/activate" pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log export PYTHONPATH="${WORKSPACE}" - if [[ $DELETE_ENV_BEFORE_RUN = true ]] ; then dos.py erase $ENV_NAME || true; fi + if [[ $DELETE_ENV_BEFORE_RUN = true ]] ; then + dos.py erase $ENV_NAME || true + fi + if [[ $CLEANUP_ALL_BEFORE_RUN = true ]] ; then + dos.py erase-old 1s --force + fi python run_system_test.py run -q --nologcapture --with-xunit "${TEST_GROUP}" deactivate -- 2.45.2