Skip to content

[Test] In test 'test_update_slurm', use instance types with higher availability to reduce the risk of ICEs. #6580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmarciani merged 1 commit into from
Nov 27, 2024
Merged

[Test] In test 'test_update_slurm', use instance types with higher availability to reduce the risk of ICEs. #6580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions tests/integration-tests/tests/update/test_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster
"queue1-i1": {
"instances": [
{
"instance_type": "c5.xlarge",
"instance_type": "c5.large",
},
{
"instance_type": "c5n.xlarge",
"instance_type": "c5n.large",
},
{
"instance_type": "c5d.xlarge",
"instance_type": "c5d.large",
},
],
"expected_running_instances": 1,
Expand Down Expand Up @@ -199,8 +199,8 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster

# Here is the expected list of nodes.
# the cluster:
# queue1-st-c5xlarge-1
# queue1-st-c5xlarge-2
# queue1-st-c5large-1
# queue1-st-c5large-2
retry(wait_fixed=seconds(20), stop_max_delay=minutes(5))(assert_initial_conditions)(
slurm_commands, 2, 0, partition="queue1"
)
Expand All @@ -210,13 +210,13 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster
"queue1-i1": {
"instances": [
{
"instance_type": "c5.xlarge",
"instance_type": "c5.large",
},
{
"instance_type": "c5n.xlarge",
"instance_type": "c5n.large",
},
{
"instance_type": "c5d.xlarge",
"instance_type": "c5d.large",
},
],
"expected_running_instances": 2,
Expand Down Expand Up @@ -591,7 +591,7 @@ def test_update_instance_list(
submit_command_args={"command": "sleep 1000", "nodes": 1, "other_options": "--exclusive"}
)
# Check instance type is the expected for min count
_check_instance_type(ec2, instances, "c5d.xlarge")
_check_instance_type(ec2, instances, "c5d.large")

# Update cluster with new configuration, adding new instance type with lower price
updated_config_file = pcluster_config_reader(bucket_name=bucket_name, config_file="pcluster.config.update.yaml")
Expand All @@ -609,7 +609,7 @@ def test_update_instance_list(
logging.info(new_instances)
new_instances.remove(instances[0])
# Check new instance type is the expected one, i.e. the one with lower price.
_check_instance_type(ec2, new_instances, "c5.xlarge")
_check_instance_type(ec2, new_instances, "c5.large")

# Update cluster removing instance type from the list
updated_config_file = pcluster_config_reader(
Expand Down
6 changes: 3 additions & 3 deletions .../integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ Scheduling:
ComputeResources:
- Name: queue1-i1
Instances:
- InstanceType: c5.xlarge
- InstanceType: c5n.xlarge
- InstanceType: c5d.xlarge
- InstanceType: c5.large
- InstanceType: c5n.large
- InstanceType: c5d.large
MinCount: 2 # Increased parameter value
MaxCount: 4 # Increased parameter value
- Name: queue1-i2
Expand Down
6 changes: 3 additions & 3 deletions tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ Scheduling:
ComputeResources:
- Name: queue1-i1
Instances:
- InstanceType: c5.xlarge
- InstanceType: c5n.xlarge
- InstanceType: c5d.xlarge
- InstanceType: c5.large
- InstanceType: c5n.large
- InstanceType: c5d.large
MinCount: 1
MaxCount: 2
- Name: queue1-i2
Expand Down
Loading