Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

copr-builders: more insistent s390x removal

Browse source
This commit is contained in:
Pavel Raiskup 2022-01-18 10:52:59 +01:00
parent 9d3be91de7
commit 8112552d10
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
View file

@ -99,7 +99,7 @@ def allocate_and_assign_ip(service, opts):
} }
data = { data = {
"name": "copr-floating-ip-" + opts.instance_name, "name": opts.instance_name,
"target": { "target": {
"id": opts.instance_created["primary_network_interface"]["id"], "id": opts.instance_created["primary_network_interface"]["id"],
}, },
@ -195,13 +195,7 @@ def create_instance(service, instance_name, opts):
except: except:
if instance_created: if instance_created:
log.info("Removing the failed machine") log.info("Removing the failed machine")
try: delete_instance(service, instance_name, opts)
delete_instance(service, instance_name, opts)
except Exception as err:
log.error(err)
if opts.allocated_floating_ip_id:
log.info("Removing the allocated Floating IP")
service.delete_floating_ip(opts.allocated_floating_ip_id)
raise raise
@ -218,7 +212,20 @@ def delete_all_ips(service, opts):
def delete_instance(service, instance_name, opts): def delete_instance(service, instance_name, opts):
""" Delete instance by it's name """ """
Repeatedly try to remove the instance, to minimize the chances for
leftovers.
"""
for _ in range(5):
try:
delete_instance_attempt(service, instance_name, opts)
break
except:
pass
def delete_instance_attempt(service, instance_name, opts):
""" one attempt to delete instance by it's name """
log = opts.log log = opts.log
log.info("Deleting instance %s", instance_name) log.info("Deleting instance %s", instance_name)
@ -340,12 +347,7 @@ def _main():
# detect_floating_ip_name(opts) # detect_floating_ip_name(opts)
create_instance(service, name, opts) create_instance(service, name, opts)
elif opts.subparser == "delete": elif opts.subparser == "delete":
for _ in range(3): delete_instance(service, name, opts)
try:
delete_instance(service, name, opts)
break
except:
continue
elif opts.subparser == "delete-free-floating-ips": elif opts.subparser == "delete-free-floating-ips":
delete_all_ips(service, opts) delete_all_ips(service, opts)