fix openstack cleanup (kubernetes-sigs#11299)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
x1h0 · Jun 21, 2024 · 647092b · 647092b
1 parent 921b0c0
commit 647092b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -71,7 +71,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
@@ -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: