Merge ~adam-collard/maas-ci/+git/system-tests:faster-image-import into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Remove unnecessary sleeps from image import

[Björn Tillenius (bjornt)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b faster-image-import lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 4b2b12f48fc1ce16d376be5f6f335eaa4d9b3ce5

review: Approve

diff --git a/systemtests/state.py b/systemtests/state.py
index 67f2793..fd00e6c 100644
--- a/systemtests/state.py
+++ b/systemtests/state.py
@@ -44,6 +44,12 @@ def import_images_and_wait_until_synced(
         osystems.add(power_config.get("osystem", "ubuntu"))
 
     authenticated_admin.update_architectures_in_boot_source_selections(architectures)
+    # TODO: Sometimes the region has already started importing images,
+    # arguably we should stop it before we configure the architectures
+    # (but then again, MAAS should do it for us). If it's already
+    # running though, we will wait a long time for the new start
+    # request to be processed.
+
     # This waits for an event to be created for the import
     authenticated_admin.import_boot_resources()
     windows_path = None
@@ -54,14 +60,8 @@ def import_images_and_wait_until_synced(
         )
 
     region_start_point = time.time()
-    # It takes a long time for images to be downloaded, give 5 minutes
-    # per architecture
-    # FIXME: When we are reusing the maas-container images should be already imported.
-    # and this sleep would not be needed.
-    sleep_time = 60 * 5 * len(architectures)
-    LOG.debug(f"Sleeping for {sleep_time}s for region image import")
-    time.sleep(sleep_time)
     while authenticated_admin.is_importing_boot_resources():
+        LOG.debug("Sleeping for 10s for region image import")
         time.sleep(10)
 
     region_time_taken = time.time() - region_start_point
@@ -82,12 +82,11 @@ def import_images_and_wait_until_synced(
         windows_time_taken = time.time() - windows_start_point
         LOG.info(f"Took {windows_time_taken:0.1f}s to upload Windows")
     rack_start_point = time.time()
-    LOG.debug(f"Sleeping for {sleep_time}s for rack image import")
-    time.sleep(sleep_time)
     rack_controller = get_rack_controllers(authenticated_admin)[0]
     boot_images = authenticated_admin.list_boot_images(rack_controller)
     while boot_images["status"] != "synced":
-        time.sleep(10)
+        LOG.debug("Sleeping for 30s to wait for rack to finish importing images")
+        time.sleep(30)
         boot_images = authenticated_admin.list_boot_images(rack_controller)
         if boot_images["status"] == "out-of-sync":
             authenticated_admin.import_boot_resources_in_rack(rack_controller)