Skip to content

Commit 3119557

Browse files
committed
[Test] In test 'test_update_slurm', use instance types with higher availability to reduce the risk of ICEs.
Signed-off-by: Giacomo Marciani <[email protected]>
1 parent 0f44c1c commit 3119557

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

tests/integration-tests/tests/update/test_update.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster
115115
"queue1-i1": {
116116
"instances": [
117117
{
118-
"instance_type": "c5.xlarge",
118+
"instance_type": "c5.large",
119119
},
120120
{
121-
"instance_type": "c5n.xlarge",
121+
"instance_type": "c5n.large",
122122
},
123123
{
124-
"instance_type": "c5d.xlarge",
124+
"instance_type": "c5d.large",
125125
},
126126
],
127127
"expected_running_instances": 1,
@@ -200,8 +200,8 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster
200200

201201
# Here is the expected list of nodes.
202202
# the cluster:
203-
# queue1-st-c5xlarge-1
204-
# queue1-st-c5xlarge-2
203+
# queue1-st-c5large-1
204+
# queue1-st-c5large-2
205205
retry(wait_fixed=seconds(20), stop_max_delay=minutes(5))(assert_initial_conditions)(
206206
slurm_commands, 2, 0, partition="queue1"
207207
)
@@ -211,13 +211,13 @@ def test_update_slurm(region, pcluster_config_reader, s3_bucket_factory, cluster
211211
"queue1-i1": {
212212
"instances": [
213213
{
214-
"instance_type": "c5.xlarge",
214+
"instance_type": "c5.large",
215215
},
216216
{
217-
"instance_type": "c5n.xlarge",
217+
"instance_type": "c5n.large",
218218
},
219219
{
220-
"instance_type": "c5d.xlarge",
220+
"instance_type": "c5d.large",
221221
},
222222
],
223223
"expected_running_instances": 2,
@@ -592,7 +592,7 @@ def test_update_instance_list(
592592
submit_command_args={"command": "sleep 1000", "nodes": 1, "other_options": "--exclusive"}
593593
)
594594
# Check instance type is the expected for min count
595-
_check_instance_type(ec2, instances, "c5d.xlarge")
595+
_check_instance_type(ec2, instances, "c5d.large")
596596

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

615615
# Update cluster removing instance type from the list
616616
updated_config_file = pcluster_config_reader(

tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ Scheduling:
4646
ComputeResources:
4747
- Name: queue1-i1
4848
Instances:
49-
- InstanceType: c5.xlarge
50-
- InstanceType: c5n.xlarge
51-
- InstanceType: c5d.xlarge
49+
- InstanceType: c5.large
50+
- InstanceType: c5n.large
51+
- InstanceType: c5d.large
5252
MinCount: 2 # Increased parameter value
5353
MaxCount: 4 # Increased parameter value
5454
- Name: queue1-i2

tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ Scheduling:
4343
ComputeResources:
4444
- Name: queue1-i1
4545
Instances:
46-
- InstanceType: c5.xlarge
47-
- InstanceType: c5n.xlarge
48-
- InstanceType: c5d.xlarge
46+
- InstanceType: c5.large
47+
- InstanceType: c5n.large
48+
- InstanceType: c5d.large
4949
MinCount: 1
5050
MaxCount: 2
5151
- Name: queue1-i2

0 commit comments

Comments
 (0)