Browse Source
fix openstack cleanup (#11299)
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
pull/11318/head
Kay Yan
4 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
10 additions and
3 deletions
-
.gitlab-ci.yml
-
scripts/openstack-cleanup/main.py
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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: |
|
|
|
|
