From bd80766aca41edcb7451464c5a27658cbe1960d6 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Fri, 9 Aug 2024 02:21:44 -0700 Subject: [PATCH] fix openstack cleanup (#11410) Signed-off-by: Kay Yan Co-authored-by: Kay Yan --- .gitlab-ci.yml | 2 +- scripts/openstack-cleanup/main.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a5de6bf0..66d44274b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ ci-not-authorized: after_script: [] rules: # LGTM or ok-to-test labels - - if: $PR_LABELS =~ /.*,(lgtm|ok-to-test).*|^(lgtm|ok-to-test).*/i + - if: $PR_LABELS =~ /.*,(lgtm|approved|ok-to-test).*|^(lgtm|approved|ok-to-test).*/i variables: CI_OK_TO_TEST: '0' when: always diff --git a/scripts/openstack-cleanup/main.py b/scripts/openstack-cleanup/main.py index ba3d4586e..28820de02 100755 --- a/scripts/openstack-cleanup/main.py +++ b/scripts/openstack-cleanup/main.py @@ -38,8 +38,15 @@ def main(): conn.compute.servers()) print('Security groups...') - map_if_old(conn.network.delete_security_group, - conn.network.security_groups()) + try: + map_if_old(conn.network.delete_security_group, + conn.network.security_groups()) + except openstack.exceptions.ConflictException as ex: + # Need to delete port when security groups is in used + map_if_old(conn.network.delete_port, + conn.network.ports()) + map_if_old(conn.network.delete_security_group, + conn.network.security_groups()) print('Ports...') try: