fix openstack cleanup (#11299)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

.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

scripts/openstack-cleanup/main.py

@@ -38,6 +38,13 @@ def main():
                conn.compute.servers())
 
     print('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())