From 110f1e39989e042424199ea577297e8a40b971c7 Mon Sep 17 00:00:00 2001 From: hanwenli Date: Tue, 30 Jun 2026 09:00:12 -0700 Subject: [PATCH] [integ-test] Use EFA 1.49.0 to build image on Rocky 9.8 1. Adds a DevSetting to use EFA 1.49.0 when building image with Rocky 9 2. Removes the old DevSetting on `enable_dcv`, because it is no longer used anymore 3. RHEL9 build is unchanged so that we are monitoring the build health on both RHEL 9.7, and Rocky 9.8 with DevSettings --- tests/integration-tests/tests/common/utils.py | 2 +- tests/integration-tests/tests/createami/test_createami.py | 8 +++++--- .../test_createami/test_build_image/image.config.yaml | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/integration-tests/tests/common/utils.py b/tests/integration-tests/tests/common/utils.py index 0293957a22..ef0e99faae 100644 --- a/tests/integration-tests/tests/common/utils.py +++ b/tests/integration-tests/tests/common/utils.py @@ -62,7 +62,7 @@ "rhel8.9": {"name": "RHEL-8.9*_HVM-*", "owners": RHEL_OWNERS}, "rocky8.9": {"name": "Rocky-8-EC2-Base-8.9*", "owners": ["792107900819"]}, # TODO add china and govcloud accounts "rhel9": {"name": "RHEL-9.7*_HVM*", "owners": RHEL_OWNERS}, - "rocky9": {"name": "Rocky-9-EC2-Base-9.7*", "owners": ["792107900819"]}, # TODO add china and govcloud accounts + "rocky9": {"name": "Rocky-9-EC2-Base-9.*", "owners": ["792107900819"]}, # TODO add china and govcloud accounts } # Remarkable AMIs are latest deep learning base AMI and FPGA developer AMI without pcluster infrastructure diff --git a/tests/integration-tests/tests/createami/test_createami.py b/tests/integration-tests/tests/createami/test_createami.py index 68df926a7b..0c90d3b3d1 100644 --- a/tests/integration-tests/tests/createami/test_createami.py +++ b/tests/integration-tests/tests/createami/test_createami.py @@ -166,10 +166,12 @@ def test_build_image( if os in ["alinux2", "alinux2023"]: update_os_packages = True - if os in ["rhel9", "rocky9"]: + if os in ["rhel9"]: update_os_packages = False - enable_dcv = True + use_newer_efa = False + if os in ["rocky9"]: + use_newer_efa = True image_config = pcluster_config_reader( config_file="image.config.yaml", @@ -179,7 +181,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(), + use_newer_efa=str(use_newer_efa).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 2a3a8bd9b1..c714817ae9 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,8 +36,8 @@ DeploymentSettings: - {{ default_vpc_security_group_id }} DevSettings: TerminateInstanceOnFailure: True -{% if enable_dcv == "false" %} +{% if use_newer_efa == "true" %} Cookbook: ExtraChefAttributes: | - {"cluster": {"dcv": {"install_enabled": false}}} + {"cluster": {"efa": {"version": "1.49.0", "sha256": "cf2e9281a2328a243c76f911a490faed43ca0fecfe4733c25e34b2e92a32c309"}}} {% endif %}