Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/integration-tests/tests/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions tests/integration-tests/tests/createami/test_createami.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use the--extra-chef-attribute for this? Any reason for hardcoding this if this is temporary lets add a commit message and comment saying so?

@himani2411 himani2411 Jul 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On 2nd thought you cant use the --extra-chef-attribute as that will apply to all the tests.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this devsetting needed when you have aws/aws-parallelcluster-cookbook#3213 merged the cookbook change?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR targets 3.15.1, to make sure 3.15.1 can build-image with the latest EFA

{% endif %}
Loading