Skip to content

Commit 718d159

Browse files
committed
SQUASH scontrol reboot
1 parent 697207a commit 718d159

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tests/integration-tests/conftest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,11 @@ def pytest_collection_finish(session):
330330
region = [unmarshal_az_override(az) for az in region]
331331
# Use the first element of the list of regions, since there must be at least one
332332
reporting_region = get_reporting_region(region[0])
333-
logging.info(f"Metadata reporting region {reporting_region}")
333+
logging.debug(f"Metadata reporting region {reporting_region}")
334334
# Setup the metadata table in case it doesn't exist
335335
MetadataTableManager(reporting_region, METADATA_TABLE).create_metadata_table()
336336
except Exception as exc:
337-
logging.info(f"There was a '{type(exc)}' error with '{exc}' when creating the table!")
337+
logging.error(f"There was a '{type(exc)}' error with '{exc}' when creating the table!")
338338

339339

340340
def _log_collected_tests(session):

tests/integration-tests/tests/schedulers/test_slurm.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -799,9 +799,11 @@ def test_scontrol_reboot(
799799
slots=2,
800800
constraint="dynamic",
801801
)
802-
# TOFIX We observe in 3.13.0 an increase in the bootstrap time for Rocky and RHEL.
802+
# TOFIX We observe in 3.13.0 an increase in the bootstrap time for AL2023, Rocky and RHEL.
803803
# We must address it and restore the default wait time to 400s.
804-
stop_max_delay_secs = 500 if (os.startswith("rocky") or os.startswith("rhel")) else 400
804+
stop_max_delay_secs = 500 if (os == "alinux2023"
805+
or os.startswith("rocky")
806+
or os.startswith("rhel")) else 400
805807
wait_for_compute_nodes_states(
806808
slurm_commands,
807809
["queue1-dy-cr1-1", "queue1-dy-cr1-2"],

0 commit comments

Comments
 (0)