sts-sponsors team mailing list archive

[Adam Collard <mp+435127@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
wait for rack controllers to be commissioned in configured_maas



Requested reviews:
  MAAS Committers (maas-committers)

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

diff --git a/systemtests/state.py b/systemtests/state.py
index 5c55070..b79b247 100644
--- a/systemtests/state.py
+++ b/systemtests/state.py
@@ -157,6 +157,9 @@ def configured_maas(
         authenticated_admin.delete_subnet("test-subnet")
     if maas_region.is_dhcp_enabled():
         maas_region.disable_dhcp(config, authenticated_admin)
+    while not all_rack_controllers_commissioned(LOG, authenticated_admin):
+        LOG.debug("Sleeping for 5s to wait for rack(s) to finish commissioning")
+        time.sleep(5)
     yield maas_region
 
 
@@ -183,9 +186,6 @@ def ready_maas(
     configured_maas: MAASRegion,
     config: dict[str, Any],
 ) -> Iterator[MAASRegion]:
-    while not all_rack_controllers_commissioned(LOG, authenticated_admin):
-        LOG.debug("Sleeping for 5s to wait for rack(s) to finish commissioning")
-        time.sleep(5)
     if not configured_maas.is_dhcp_enabled():
         configured_maas.enable_dhcp(config, authenticated_admin)
     yield configured_maas