done

Author: sanderegg

services/autoscaling/tests/unit/conftest.py

@@ -1034,6 +1034,38 @@ def hot_buffer_instance_type(app_settings: ApplicationSettings) -> InstanceTypeT
     )
 
 
+@pytest.fixture
+def hot_buffer_has_pre_pull(
+    app_settings: ApplicationSettings,
+    hot_buffer_instance_type: InstanceTypeType,
+) -> bool:
+    assert app_settings.AUTOSCALING_EC2_INSTANCES
+    return bool(
+        app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING
+        or app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES[
+            hot_buffer_instance_type
+        ].pre_pull_images
+    )
+
+
+@pytest.fixture
+def hot_buffer_expected_pre_pulled_images(
+    app_settings: ApplicationSettings,
+    hot_buffer_instance_type: InstanceTypeType,
+) -> list[DockerGenericTag]:
+    assert app_settings.AUTOSCALING_EC2_INSTANCES
+    return sorted(
+        set(
+            app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING
+        )
+        | set(
+            app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES[
+                hot_buffer_instance_type
+            ].pre_pull_images
+        )
+    )
+
+
 @pytest.fixture
 def mock_find_node_with_name_returns_none(mocker: MockerFixture) -> Iterator[mock.Mock]:
     return mocker.patch(

services/autoscaling/tests/unit/test_modules_cluster_scaling_dynamic.py

@@ -210,6 +210,7 @@ def minimal_configuration(
     mocked_ssm_server_envs: EnvVarsDict,
     enabled_dynamic_mode: EnvVarsDict,
     mocked_ec2_instances_envs: EnvVarsDict,
+    with_ec2_instances_cold_start_docker_images_pre_pulling: EnvVarsDict,
     disabled_rabbitmq: None,
     disable_autoscaling_background_task: None,
     disable_buffers_pool_background_task: None,
@@ -342,30 +343,6 @@ async def test_cluster_scaling_with_no_services_does_nothing(
     )
 
 
-@pytest.fixture
-def hot_buffer_has_pre_pull(
-    app_settings: ApplicationSettings,
-    hot_buffer_instance_type: InstanceTypeType,
-) -> bool:
-    assert app_settings.AUTOSCALING_EC2_INSTANCES
-    return bool(
-        app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES[
-            hot_buffer_instance_type
-        ].pre_pull_images
-    )
-
-
-@pytest.fixture
-def hot_buffer_expected_pre_pulled_images(
-    app_settings: ApplicationSettings,
-    hot_buffer_instance_type: InstanceTypeType,
-) -> list[DockerGenericTag]:
-    assert app_settings.AUTOSCALING_EC2_INSTANCES
-    return app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES[
-        hot_buffer_instance_type
-    ].pre_pull_images
-
-
 @pytest.mark.parametrize(
     # NOTE: only the main test test_cluster_scaling_up_and_down is run with all options
     "with_docker_join_drained",