From ec78efcb765c7a5178d5d5dd800f5d2705cae9f4 Mon Sep 17 00:00:00 2001 From: Xuanqi He Date: Fri, 19 Dec 2025 16:57:46 -0500 Subject: [PATCH 1/2] Skip dcv installation when test_build_image on Ubuntu --- tests/integration-tests/tests/createami/test_createami.py | 6 ++++++ .../test_createami/test_build_image/image.config.yaml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/tests/integration-tests/tests/createami/test_createami.py b/tests/integration-tests/tests/createami/test_createami.py index 1145494cc2..26afcfcf53 100644 --- a/tests/integration-tests/tests/createami/test_createami.py +++ b/tests/integration-tests/tests/createami/test_createami.py @@ -157,6 +157,11 @@ def test_build_image( enable_lustre_client = False if os in ["alinux2", "alinux2023", "rocky9"]: update_os_packages = True + + # Disable DCV installation for Ubuntu + # TODO: When the Ubuntu DCV issue resolved, remove this line. + enable_dcv = "ubuntu" not in os + image_config = pcluster_config_reader( config_file="image.config.yaml", parent_image=base_ami, @@ -165,6 +170,7 @@ def test_build_image( enable_nvidia=str(enable_nvidia and get_gpu_count(instance) > 0).lower(), update_os_packages=str(update_os_packages).lower(), enable_lustre_client=str(enable_lustre_client).lower(), + enable_dcv=str(enable_dcv).lower(), ) image = images_factory(image_id, image_config, region) diff --git a/tests/integration-tests/tests/createami/test_createami/test_build_image/image.config.yaml b/tests/integration-tests/tests/createami/test_createami/test_build_image/image.config.yaml index db15a8ece3..2a3a8bd9b1 100644 --- a/tests/integration-tests/tests/createami/test_createami/test_build_image/image.config.yaml +++ b/tests/integration-tests/tests/createami/test_createami/test_build_image/image.config.yaml @@ -36,3 +36,8 @@ DeploymentSettings: - {{ default_vpc_security_group_id }} DevSettings: TerminateInstanceOnFailure: True +{% if enable_dcv == "false" %} + Cookbook: + ExtraChefAttributes: | + {"cluster": {"dcv": {"install_enabled": false}}} +{% endif %} From 0d21097c5d4af3d706278390eae97ae4e59d0146 Mon Sep 17 00:00:00 2001 From: Xuanqi He Date: Fri, 19 Dec 2025 17:56:18 -0500 Subject: [PATCH 2/2] Limit this test case to ubuntu24.04 --- tests/integration-tests/tests/createami/test_createami.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/integration-tests/tests/createami/test_createami.py b/tests/integration-tests/tests/createami/test_createami.py index 26afcfcf53..4239fd62ae 100644 --- a/tests/integration-tests/tests/createami/test_createami.py +++ b/tests/integration-tests/tests/createami/test_createami.py @@ -158,9 +158,8 @@ def test_build_image( if os in ["alinux2", "alinux2023", "rocky9"]: update_os_packages = True - # Disable DCV installation for Ubuntu - # TODO: When the Ubuntu DCV issue resolved, remove this line. - enable_dcv = "ubuntu" not in os + # Disable DCV installation for Ubuntu 24.04 to avoid build failures with DLAMI + enable_dcv = os != "ubuntu2404" image_config = pcluster_config_reader( config_file="image.config.yaml",