[Integ-tests] Fix test_on_demand_capacity_reservation

The fixtures to create capacity reservations failed because of insufficient capacity.
Solution: Change the instance types to more common ones. Note that burstable instance types do not support placement groups. Therefore, I have to use c5, r5, m5 instances.

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

Author: hanwen-cluster

tests/integration-tests/conftest.py

@@ -1329,14 +1329,14 @@ def odcr_stack(request, region, placement_group_stack, cfn_stacks_factory, vpc_s
         AvailabilityZone=availability_zone,
         InstanceCount=4,
         InstancePlatform="Linux/UNIX",
-        InstanceType="c6gn.xlarge",
+        InstanceType="c5.xlarge",
     )
     target_odcr = ec2.CapacityReservation(
         "integTestsTargetOdcr",
         AvailabilityZone=availability_zone,
         InstanceCount=4,
         InstancePlatform="Linux/UNIX",
-        InstanceType="c7g.xlarge",
+        InstanceType="r5.xlarge",
         InstanceMatchCriteria="targeted",
     )
     pg_name = placement_group_stack.cfn_resources["PlacementGroup"]
@@ -1345,7 +1345,7 @@ def odcr_stack(request, region, placement_group_stack, cfn_stacks_factory, vpc_s
         AvailabilityZone=availability_zone,
         InstanceCount=2,
         InstancePlatform="Linux/UNIX",
-        InstanceType="m6g.xlarge",
+        InstanceType="m5.xlarge",
         InstanceMatchCriteria="targeted",
         PlacementGroupArn=boto3.resource("ec2").PlacementGroup(pg_name).group_arn,
     )

tests/integration-tests/tests/networking/test_on_demand_capacity_reservation/test_on_demand_capacity_reservation/pcluster.config.yaml

@@ -1,7 +1,7 @@
 Image:
   Os: {{ os }}
 HeadNode:
-  InstanceType: c7g.xlarge
+  InstanceType: r5.xlarge
   Networking:
     SubnetId: {{ public_subnet_id }}
   Ssh:
@@ -12,19 +12,19 @@ Scheduling:
     - Name: open-odcr-q
       ComputeResources:
         - Name: open-odcr-id-cr
-          InstanceType: c6gn.xlarge
+          InstanceType: c5.xlarge
           MinCount: 1
           MaxCount: 10
           CapacityReservationTarget:
             CapacityReservationId: {{ open_capacity_reservation_id }}
         - Name: open-odcr-arn-cr
-          InstanceType: c6gn.xlarge
+          InstanceType: c5.xlarge
           MinCount: 1
           MaxCount: 10
           CapacityReservationTarget:
             CapacityReservationResourceGroupArn: {{ open_capacity_reservation_arn }}
         - Name: open-odcr-id-pg-cr
-          InstanceType: c6gn.xlarge
+          InstanceType: c5.xlarge
           MinCount: 1
           MaxCount: 10
           Networking:
@@ -33,7 +33,7 @@ Scheduling:
           CapacityReservationTarget:
             CapacityReservationId: {{ open_capacity_reservation_id }}
         - Name: open-odcr-arn-pg-cr
-          InstanceType: c6gn.xlarge
+          InstanceType: c5.xlarge
           MinCount: 1
           MaxCount: 10
           Networking:
@@ -47,19 +47,19 @@ Scheduling:
     - Name: target-odcr-q
       ComputeResources:
         - Name: target-odcr-id-cr
-          InstanceType: c7g.xlarge
+          InstanceType: r5.xlarge
           MinCount: 1
           MaxCount: 10
           CapacityReservationTarget:
             CapacityReservationId: {{ target_capacity_reservation_id }}
         - Name: target-odcr-arn-cr
-          InstanceType: c7g.xlarge
+          InstanceType: r5.xlarge
           MinCount: 1
           MaxCount: 10
           CapacityReservationTarget:
             CapacityReservationResourceGroupArn: {{ target_capacity_reservation_arn }}
         - Name: target-odcr-id-pg-cr
-          InstanceType: c7g.xlarge
+          InstanceType: r5.xlarge
           MinCount: 1
           MaxCount: 10
           Networking:
@@ -68,7 +68,7 @@ Scheduling:
           CapacityReservationTarget:
             CapacityReservationId: {{ target_capacity_reservation_id }}
         - Name: target-odcr-arn-pg-cr
-          InstanceType: c7g.xlarge
+          InstanceType: r5.xlarge
           MinCount: 1
           MaxCount: 10
           CapacityReservationTarget:
@@ -79,7 +79,7 @@ Scheduling:
     - Name: pg-odcr-q
       ComputeResources:
         - Name: pg-odcr-id-cr
-          InstanceType: m6g.xlarge
+          InstanceType: m5.xlarge
           MinCount: 1
           MaxCount: 10
           Networking:
@@ -88,7 +88,7 @@ Scheduling:
           CapacityReservationTarget:
             CapacityReservationId: {{ pg_capacity_reservation_id }}
         - Name: pg-odcr-arn-cr
-          InstanceType: m6g.xlarge
+          InstanceType: m5.xlarge
           MinCount: 1
           MaxCount: 10
           Networking: