sts-sponsors team mailing list archive

[Adam Collard <mp+435834@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/system-tests:bump-timeouts into ~maas-committers/maas-ci/+git/system-tests:master.

Commit message:
Bump timeouts

Enlistment to 50min from 30min
Other status changes to 40mins from 20mins


Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/system-tests/+merge/435834
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/system-tests:bump-timeouts into ~maas-committers/maas-ci/+git/system-tests:master.

diff --git a/systemtests/tests_per_machine/test_machine.py b/systemtests/tests_per_machine/test_machine.py
index f8b42ca..87e8b93 100644
--- a/systemtests/tests_per_machine/test_machine.py
+++ b/systemtests/tests_per_machine/test_machine.py
@@ -95,7 +95,7 @@ def test_full_circle(
 
     yield
 
-    timeout = 40 * 60 if machine_config.power_type == "lxd" else 20 * 60
+    TIMEOUT = 40 * 60
     maas_api_client.commission_machine(machine)
 
     wait_for_machine(
@@ -104,7 +104,7 @@ def test_full_circle(
         status="Ready",
         abort_status="Failed commissioning",
         machine_id=machine_config.name,
-        timeout=timeout,
+        timeout=TIMEOUT,
     )
 
     assert machine["ip_addresses"][0] in dynamic_range
@@ -120,7 +120,7 @@ def test_full_circle(
         status="Deployed",
         abort_status="Failed deployment",
         machine_id=machine_config.name,
-        timeout=timeout,
+        timeout=TIMEOUT,
     )
 
     assert machine["ip_addresses"][0] not in dynamic_range
@@ -168,6 +168,6 @@ def test_full_circle(
         status="Ready",
         abort_status="Releasing failed",
         machine_id=machine_config.name,
-        timeout=timeout,
+        timeout=TIMEOUT,
     )
     yield
diff --git a/systemtests/utils.py b/systemtests/utils.py
index d3858bd..ef4dc37 100644
--- a/systemtests/utils.py
+++ b/systemtests/utils.py
@@ -191,7 +191,7 @@ def wait_for_new_machine(
     """Blocks execution until a machine with the given mac_address appears as New."""
     __tracebackhide__ = True
     quiet_client = api.QuietAuthenticatedAPIClient.from_api_client(api_client)
-    for retry_info in retries(30 * 60, 30):
+    for retry_info in retries(50 * 60, 30):
         machines = quiet_client.list_machines(mac_address=mac_address, status="new")
         if machines:
             return machines[0]