Skip to content
Merged
Changes from all commits
Commits
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: 17 additions & 3 deletions CIME/wait_for_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def create_cdash_xml_boiler(
utc_time,
current_time,
hostname,
description="",
):
###############################################################################
site_elem = xmlet.Element("Site")
Expand All @@ -103,6 +104,8 @@ def create_cdash_xml_boiler(
site_elem.attrib["OSName"] = "Linux"
site_elem.attrib["Hostname"] = hostname
site_elem.attrib["OSVersion"] = "Unknown"
if description:
site_elem.attrib["Description"] = description

phase_elem = xmlet.SubElement(site_elem, phase)

Expand All @@ -123,6 +126,7 @@ def create_cdash_config_xml(
current_time,
hostname,
data_rel_path,
description="",
):
###############################################################################
site_elem, config_elem = create_cdash_xml_boiler(
Expand All @@ -132,6 +136,7 @@ def create_cdash_config_xml(
utc_time,
current_time,
hostname,
description=description,
)

xmlet.SubElement(config_elem, "ConfigureCommand").text = "namelists"
Expand Down Expand Up @@ -168,6 +173,7 @@ def create_cdash_build_xml(
current_time,
hostname,
data_rel_path,
description="",
):
###############################################################################
site_elem, build_elem = create_cdash_xml_boiler(
Expand All @@ -177,6 +183,7 @@ def create_cdash_build_xml(
utc_time,
current_time,
hostname,
description=description,
)

xmlet.SubElement(build_elem, "ConfigureCommand").text = "case.build"
Expand Down Expand Up @@ -215,6 +222,7 @@ def create_cdash_test_xml(
current_time,
hostname,
data_rel_path,
description="",
):
###############################################################################
site_elem, testing_elem = create_cdash_xml_boiler(
Expand All @@ -224,6 +232,7 @@ def create_cdash_test_xml(
utc_time,
current_time,
hostname,
description=description,
)

test_list_elem = xmlet.SubElement(testing_elem, "TestList")
Expand Down Expand Up @@ -297,6 +306,7 @@ def create_cdash_xml_fakes(
current_time,
hostname,
data_rel_path,
description="",
):
###############################################################################

Expand All @@ -308,6 +318,7 @@ def create_cdash_xml_fakes(
current_time,
hostname,
data_rel_path,
description=description,
)

create_cdash_build_xml(
Expand All @@ -318,6 +329,7 @@ def create_cdash_xml_fakes(
current_time,
hostname,
data_rel_path,
description=description,
)

create_cdash_test_xml(
Expand All @@ -328,6 +340,7 @@ def create_cdash_xml_fakes(
current_time,
hostname,
data_rel_path,
description=description,
)


Expand Down Expand Up @@ -481,6 +494,8 @@ def create_cdash_xml(
else:
tmproots = [None, first_result_case, os.getcwd()]

notes = f"Commit {git_commit}\nTotal testing time {time_info} seconds\n"

# Try multiple tmproots if necessary. The default /tmp will be tried first
# unless cdash_tmproot was provided. The location of the default can be
# modified via the TMPDIR environment variable.
Expand All @@ -503,9 +518,7 @@ def create_cdash_xml(

# Make notes file
with notes_file.open(mode="w") as notes_fd:
notes_fd.write(
f"Commit {git_commit}\nTotal testing time {time_info} seconds\n"
)
notes_fd.write(notes)

create_cdash_xml_fakes(
results,
Expand All @@ -515,6 +528,7 @@ def create_cdash_xml(
current_time,
hostname,
testtime_dir,
description=notes,
)

create_cdash_upload_xml(
Expand Down
Loading