[Test] Make integration test covering multiple NICS use Capacity Reservation Target when running on p4d.24xlarge.

Signed-off-by: Giacomo Marciani <[email protected]>

Author: gmarciani

tests/integration-tests/tests/multiple_nics/test_multiple_nics.py

@@ -9,7 +9,6 @@
 # or in the "LICENSE.txt" file accompanying this file.
 # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
-import boto3
 import pytest
 from assertpy import assert_that
 from remote_command_executor import RemoteCommandExecutor
@@ -19,22 +18,12 @@
 @pytest.mark.usefixtures("os", "instance", "scheduler")
 def test_multiple_nics(
     region,
-    instance,
     pcluster_config_reader,
     test_datadir,
     clusters_factory,
-    s3_bucket_factory,
     scheduler_commands_factory,
 ):
-    # 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")
-    cluster_config = pcluster_config_reader(
-        bucket_name=bucket_name,
-    )
+    cluster_config = pcluster_config_reader()
     cluster = clusters_factory(cluster_config)
     remote_command_executor = RemoteCommandExecutor(cluster)
     scheduler_commands = scheduler_commands_factory(remote_command_executor)

tests/integration-tests/tests/multiple_nics/test_multiple_nics/test_multiple_nics/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 }}
   {% if scheduler == "awsbatch" %}AwsBatchQueues:{% else %}SlurmQueues:{% endif %}
@@ -37,6 +25,10 @@ Scheduling:
           MinCount: 1
           Efa:
             Enabled: true
+          {% if instance == "p4d.24xlarge" %}
+          CapacityReservationTarget:
+            CapacityReservationResourceGroupArn: arn:aws:resource-groups:us-east-1:447714826191:group/EC2CRGroup
+          {% endif %}
           {% endif %}
       Networking:
         SubnetIds: