Skip to content

[Test] Fix test_slurm_custom_partitions: use instance type defined in test config #7375

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

Open
gmarciani wants to merge 1 commit into
base: develop
Choose a base branch
from
+17 −4
Open

[Test] Fix test_slurm_custom_partitions: use instance type defined in test config #7375

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
21 changes: 17 additions & 4 deletions tests/integration-tests/tests/schedulers/test_slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,13 @@ def test_slurm_scaling(
@pytest.mark.usefixtures("os", "instance", "scheduler")
@pytest.mark.slurm_scaling
def test_slurm_custom_partitions(
region, pcluster_config_reader, s3_bucket_factory, clusters_factory, test_datadir, scheduler_commands_factory
region,
instance,
pcluster_config_reader,
s3_bucket_factory,
clusters_factory,
test_datadir,
scheduler_commands_factory,
):
"""Test ParallelCluster node deamons manage only Slurm partitions specified in cluster configuration file."""
bucket_name = s3_bucket_factory()
Expand Down Expand Up @@ -352,6 +358,7 @@ def test_slurm_custom_partitions(
remote_command_executor,
running_partition=custom_partitions[0],
failing_partition=failing_partition,
running_instance_type=instance,
)
_check_protected_mode_message_in_log(remote_command_executor)
check_status(cluster, compute_fleet_status="PROTECTED")
Expand Down Expand Up @@ -479,7 +486,11 @@ def test_slurm_protected_mode(

partition = "half-broken"
pending_job_id = _test_active_job_running(
scheduler_commands, remote_command_executor, running_partition=partition, failing_partition=partition
scheduler_commands,
remote_command_executor,
running_partition=partition,
failing_partition=partition,
running_instance_type="c5.xlarge",
)
_test_protected_mode(scheduler_commands, remote_command_executor, cluster)
test_cluster_health_metric(["NoCorrespondingInstanceErrors", "OnNodeStartRunErrors"], cluster.cfn_name, region)
Expand Down Expand Up @@ -2109,7 +2120,9 @@ def _test_disable_protected_mode(
)


def _test_active_job_running(scheduler_commands, remote_command_executor, running_partition, failing_partition):
def _test_active_job_running(
scheduler_commands, remote_command_executor, running_partition, failing_partition, running_instance_type
):
"""
Test cluster is not placed into protected mode when there is an active job running even reach threshold.

Expand All @@ -2124,7 +2137,7 @@ def _test_active_job_running(scheduler_commands, remote_command_executor, runnin
"command": "sleep 3000",
"nodes": 1,
"partition": running_partition,
"constraint": "c5.xlarge",
"constraint": running_instance_type,
}
)
# Wait for the job to run
Expand Down
Loading