From 8264852d64a7180fb8d99462a65fd350fd5a755d Mon Sep 17 00:00:00 2001 From: Hanwen Date: Tue, 14 Feb 2023 07:48:48 -0800 Subject: [PATCH] [integ-test] Change ODCR instance type test_on_demand_capacity_reservation was using c5.xlarge as one of the open ODCRs. However, open ODCRs can be shared with other tests in the same availability zone, causing test_on_demand_capacity_reservation failing because of insufficient reservation capacity. Therefore,to avoid other tests using ODCR mistakenly, this commit changes the instance type to m5.2xlarge, which is not widely used in our integration tests Signed-off-by: Hanwen --- tests/integration-tests/conftest.py | 2 +- .../pcluster.config.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration-tests/conftest.py b/tests/integration-tests/conftest.py index 6af07a2b69..e233e13a95 100644 --- a/tests/integration-tests/conftest.py +++ b/tests/integration-tests/conftest.py @@ -1400,7 +1400,7 @@ def odcr_stack(request, region, placement_group_stack, cfn_stacks_factory, vpc_s AvailabilityZone=availability_zone, InstanceCount=4, InstancePlatform="Linux/UNIX", - InstanceType="c5.xlarge", + InstanceType="m5.2xlarge", ) target_odcr = ec2.CapacityReservation( "integTestsTargetOdcr", diff --git a/tests/integration-tests/tests/networking/test_on_demand_capacity_reservation/test_on_demand_capacity_reservation/pcluster.config.yaml b/tests/integration-tests/tests/networking/test_on_demand_capacity_reservation/test_on_demand_capacity_reservation/pcluster.config.yaml index 0d9e7247e9..02f9364ec5 100644 --- a/tests/integration-tests/tests/networking/test_on_demand_capacity_reservation/test_on_demand_capacity_reservation/pcluster.config.yaml +++ b/tests/integration-tests/tests/networking/test_on_demand_capacity_reservation/test_on_demand_capacity_reservation/pcluster.config.yaml @@ -12,19 +12,19 @@ Scheduling: - Name: open-odcr-q ComputeResources: - Name: open-odcr-id-cr - InstanceType: c5.xlarge + InstanceType: m5.2xlarge MinCount: 1 MaxCount: 10 CapacityReservationTarget: CapacityReservationId: {{ open_capacity_reservation_id }} - Name: open-odcr-arn-cr - InstanceType: c5.xlarge + InstanceType: m5.2xlarge MinCount: 1 MaxCount: 10 CapacityReservationTarget: CapacityReservationResourceGroupArn: {{ open_capacity_reservation_arn }} - Name: open-odcr-id-pg-cr - InstanceType: c5.xlarge + InstanceType: m5.2xlarge MinCount: 1 MaxCount: 10 Networking: @@ -33,7 +33,7 @@ Scheduling: CapacityReservationTarget: CapacityReservationId: {{ open_capacity_reservation_id }} - Name: open-odcr-arn-pg-cr - InstanceType: c5.xlarge + InstanceType: m5.2xlarge MinCount: 1 MaxCount: 10 Networking: