All full cleanup to swarm jobs

Change-Id: I76d3868c7e4b7710b56fd04ef7cb299c709b028f

diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml
index 706f094733e18feb1758af9eee3cae03fb986063..4d874e153dcf6a1e10b9b9576496c702470876bf 100644 (file)
--- 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 a3fc8701b55d4ec12d619e519b6bc94ca2a76b97..34ead94c07048b9e049d1e4522a09f0047704857 100644 (file)
--- 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