Cleanup for all cases

.gitlab-ci.yml

@@ -37,9 +37,12 @@ testing_cleanup:
     only:
         - schedules
     script:
+        # Required to use ai-tools and delete puppet managed machines
+        - echo "${IMAGECI_PWD}" | kinit ${IMAGECI_USER}@CERN.CH
+        # Required to use openstack client and delete non-puppet machines
         - export OS_USERNAME=${IMAGECI_USER}
         - export OS_PASSWORD=${IMAGECI_PWD}
-        # OS_TENANT_ID corresponds to "IT Linux Support - CI VMs" tenant.
-        # Python clients cannot escape spaces in tenant's name
-        - export OS_TENANT_ID=8e35e961-f888-4622-bf7d-5fe9eb8cf563
-        - python /cleanup.py
+        # Run against the Virtual machines tenant
+        - python3 ./cleanup.py --tenant_name "IT Linux Support - CI VMs" --metadata_cleanup "centos_test_cleanup" --metadata_managed "puppet_managed"
+        # Run against the Physical machines tenant
+        - python3 ./cleanup.py --tenant_name "IT Linux Support - CI Physical" --metadata_cleanup "centos_test_cleanup" --metadata_managed "puppet_managed"