From b965df5d41f63ca16f18add6339fb0d2ef36369a Mon Sep 17 00:00:00 2001
From: istmxrein <maximilian.reinheimer@stud.h-da.de>
Date: Tue, 2 May 2023 12:51:58 +0200
Subject: [PATCH] increase timeout
---
cleanup.py | 5 ++---
env.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cleanup.py b/cleanup.py
index d3f3e9e..e76f89e 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -12,7 +12,7 @@ def main() -> None:
conn = openstack.connect()
for server in conn.compute.servers(name=env.VM_NAME):
- volumes = server.list_volumes()
+ volumes = server.attached_volumes
for i in range(5):
conn.delete_server(server.id, delete_ips=True)
time.sleep(5)
@@ -28,12 +28,11 @@ def main() -> None:
if conn.block_storage.find_volume(volume.id):
conn.block_storage.delete_volume(volume.id)
print(f"Successfully deleted volume with ID {volume.id}", flush=True)
- return
+ break
except openstack.exceptions.SDKException as e:
print(f"Error deleting volume with ID {volume.id}: {e}", flush=True)
print("Retrying in 10 seconds...", flush=True)
time.sleep(10)
- print(f"Unable to delete volume with ID {volume.id} after 5 minutes", flush=True)
if os.path.exists(env.PRIVATE_KEY_PATH):
os.remove(env.PRIVATE_KEY_PATH)
diff --git a/env.py b/env.py
index 4c66039..37a5756 100644
--- a/env.py
+++ b/env.py
@@ -14,4 +14,4 @@ FLOATING_IP_NETWORK = os.getenv("FLOATING_IP_NETWORK") or "public"
SSH_IP_VERSION = os.getenv("SSH_IP_VERSION") or "4"
BUILD_FAILURE_EXIT_CODE = os.getenv("BUILD_FAILURE_EXIT_CODE")
SYSTEM_FAILURE_EXIT_CODE = os.getenv("SYSTEM_FAILURE_EXIT_CODE")
-SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "180"
+SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "300"
--
GitLab