Integ-tests: Change test_efa to use ODCR from cluster configuration file

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

tests/integration-tests/tests/efa/test_efa.py

@@ -12,7 +12,6 @@
 import logging
 import re
 
-import boto3
 from assertpy import assert_that
 from remote_command_executor import RemoteCommandExecutor
 from utils import get_compute_nodes_instance_ids
@@ -54,19 +53,8 @@ def test_efa(
     else:
         head_node_instance = "c6g.16xlarge"
 
-    # Post-install script to use P4d targeted ODCR
-    bucket_name = ""
-    if instance == "p4d.24xlarge":
-        bucket_name = s3_bucket_factory()
-        bucket = boto3.resource("s3", region_name=region).Bucket(bucket_name)
-        bucket.upload_file(str(test_datadir / "run_instance_override.sh"), "run_instance_override.sh")
-
     slots_per_instance = fetch_instance_slots(region, instance, multithreading_disabled=True)
-    cluster_config = pcluster_config_reader(
-        max_queue_size=max_queue_size,
-        head_node_instance=head_node_instance,
-        bucket_name=bucket_name,
-    )
+    cluster_config = pcluster_config_reader(max_queue_size=max_queue_size, head_node_instance=head_node_instance)
     cluster = clusters_factory(cluster_config)
     remote_command_executor = RemoteCommandExecutor(cluster)
     scheduler_commands = scheduler_commands_factory(remote_command_executor)

tests/integration-tests/tests/efa/test_efa/test_efa/pcluster.config.yaml

@@ -9,18 +9,6 @@ HeadNode:
     KeyName: {{ key_name }}
   Imds:
     Secured: {{ imds_secured }}
-{% if instance == "p4d.24xlarge" %}
-  Iam:
-    # Needed to use the p4d capacity reservation
-    AdditionalIamPolicies:
-      - Policy: arn:aws:iam::aws:policy/AmazonEC2FullAccess
-    S3Access:
-      - BucketName: {{ bucket_name }}
-        EnableWriteAccess: false
-  CustomActions:
-    OnNodeConfigured:
-      Script: s3://{{ bucket_name }}/run_instance_override.sh
-{% endif %}
 Scheduling:
   Scheduler: {{ scheduler }}
   SlurmQueues:
@@ -40,6 +28,10 @@ Scheduling:
           Efa:
             Enabled: true
             {% if instance == "p4d.24xlarge" %}GdrSupport: true{% endif %}
+{% if instance == "p4d.24xlarge" %}
+          CapacityReservationTarget:
+            CapacityReservationId: cr-0fa65fcdbd597f551
+{% endif %}
 SharedStorage:
   - MountDir: /shared
     Name: name1