anthony.wen/cds-ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: preserve all hosts in non-categorized watcher summaries

Browse Source
This commit is contained in:
anthony.wen
2026-04-13 22:46:23 -04:00
parent e801fd3b6b
commit 6403fa3d42
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
atvm/watcher-service/atvm_run_watcher.py
View File

@@ -696,6 +696,26 @@ def extract_latest_run_summary(log_text: str, inventory: Dict[str, str]) -> Opti
return summaries[-1] return summaries[-1]
def extract_merged_run_summary(log_text: str, inventory: Dict[str, str]) -> Optional[Dict[str, object]]:
summaries = extract_completed_subrun_summaries(log_text, inventory)
if not summaries:
return None
merged_host_results: Dict[str, HostResult] = {}
latest_currents_url: Optional[str] = None
for summary in summaries:
for host, result in summary["host_results"].items():
merged_host_results[host] = result
currents_url = summary.get("currents_url")
if isinstance(currents_url, str) and currents_url:
latest_currents_url = currents_url
return {
"host_results": merged_host_results,
"currents_url": latest_currents_url,
}
def collect_host_results( def collect_host_results(
reporter_root: Path, reporter_root: Path,
expected_hosts: List[str], expected_hosts: List[str],
@@ -1830,16 +1850,16 @@ def determine_state(
# Non-categorized runs often only write a final check-xml reporter XML. # Non-categorized runs often only write a final check-xml reporter XML.
# Prefer the parent "Cloud Run Finished" host summary because it preserves # Prefer the parent "Cloud Run Finished" host summary because it preserves
# final pass/fail counts even when reporter fallback artifacts are sparse. # final pass/fail counts even when reporter fallback artifacts are sparse.
latest_summary = extract_latest_run_summary(log_text, inventory) merged_summary = extract_merged_run_summary(log_text, inventory)
if latest_summary: if merged_summary:
summary_results = latest_summary["host_results"] summary_results = merged_summary["host_results"]
for host, result in summary_results.items(): for host, result in summary_results.items():
parent_host_results[host] = result parent_host_results[host] = result
if subrun_states: if subrun_states:
subrun = subrun_states[-1] subrun = subrun_states[-1]
subrun["host_results"] = summary_results subrun["host_results"] = dict(parent_host_results)
if not subrun.get("currents_url") and latest_summary.get("currents_url"): if not subrun.get("currents_url") and merged_summary.get("currents_url"):
subrun["currents_url"] = latest_summary["currents_url"] subrun["currents_url"] = merged_summary["currents_url"]
subrun["state"] = "FAILED" if any(result.failures for result in summary_results.values()) else "COMPLETED" subrun["state"] = "FAILED" if any(result.failures for result in summary_results.values()) else "COMPLETED"
parent_start_candidates = [subrun["start_ts"] for subrun in subrun_states if subrun["start_ts"]] parent_start_candidates = [subrun["start_ts"] for subrun in subrun_states if subrun["start_ts"]]