Merge ~adam-collard/maas-ci/+git/system-tests:configured-maas-commissioned-rack into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 9bfb1c2def53004c15db208cd8d922aedc2da323
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:configured-maas-commissioned-rack
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 24 lines (+3/-3)
1 file modified
systemtests/state.py (+3/-3)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Approve
Review via email: mp+435127@code.launchpad.net

Commit message

wait for rack controllers to be commissioned in configured_maas

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b configured-maas-commissioned-rack lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 9bfb1c2def53004c15db208cd8d922aedc2da323

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemtests/state.py b/systemtests/state.py
2index 5c55070..b79b247 100644
3--- a/systemtests/state.py
4+++ b/systemtests/state.py
5@@ -157,6 +157,9 @@ def configured_maas(
6 authenticated_admin.delete_subnet("test-subnet")
7 if maas_region.is_dhcp_enabled():
8 maas_region.disable_dhcp(config, authenticated_admin)
9+ while not all_rack_controllers_commissioned(LOG, authenticated_admin):
10+ LOG.debug("Sleeping for 5s to wait for rack(s) to finish commissioning")
11+ time.sleep(5)
12 yield maas_region
13
14
15@@ -183,9 +186,6 @@ def ready_maas(
16 configured_maas: MAASRegion,
17 config: dict[str, Any],
18 ) -> Iterator[MAASRegion]:
19- while not all_rack_controllers_commissioned(LOG, authenticated_admin):
20- LOG.debug("Sleeping for 5s to wait for rack(s) to finish commissioning")
21- time.sleep(5)
22 if not configured_maas.is_dhcp_enabled():
23 configured_maas.enable_dhcp(config, authenticated_admin)
24 yield configured_maas

Subscribers

People subscribed via source and target branches

to all changes: