step

Author: pillo79

extra/ci_collect_logs.py

@@ -180,7 +180,7 @@ def process_build_reports():
 
 		first_line = True
 		for board in artifact_boards:
-			print(f"<tr>", f"<td rowspan='{len(artifact_boards)}'>{BOARD_STATUS[artifact_status]} <a href='#{artifact}'><code>{artifact}</code></a></td>" if first_line else "")
+			print(f"<tr>", f"<td rowspan='{len(artifact_boards)}'>{BOARD_STATUS[artifact_status]} <a href='#user-content-{artifact}'><code>{artifact}</code></a></td>" if first_line else "")
 			first_line = False
 
 			summary = BOARD_SUMMARY[board]
@@ -190,7 +190,7 @@ def process_build_reports():
 
 			print(f"<td><code>{board_link}</code></td><td align='center'>{BOARD_STATUS[status]}</td>")
 			if status == FAILURE:
-				print(f"<td colspan=3>{TEST_MATRIX['CI test'][board]['issues'][0]}</td></tr>")
+				print(f"<td colspan='3'>{TEST_MATRIX['CI test'][board]['issues'][0]}</td></tr>")
 			else:
 				tests_str = summary['tests'] or "-"
 				warnings_str = summary['warnings'] or "-"
@@ -215,7 +215,7 @@ def process_build_reports():
 
 		# Print the test matrix
 
-		header_row = "<tr><th colspan=2>Sketch / Board</th>"
+		header_row = "<tr><th colspan='2'>Sketch / Board</th>"
 		for board in artifact_boards:
 			status = BOARD_SUMMARY[board]['status']
 			header_col = f"<code>{board}</code>"
@@ -226,7 +226,7 @@ def process_build_reports():
 			header_row += f"<th>{header_col}</th>"
 		header_row += "</tr>"
 
-		print("<table id='#{artifact}'>")
+		print(f"<table id='{artifact}'>")
 		print(header_row)
 
 		artifact_matrix = { sketch: results for sketch, results in TEST_MATRIX.items() if any(board in results for board in artifact_boards) }
@@ -240,17 +240,18 @@ def process_build_reports():
 				issues = test_result['issues'] if test_result else ""
 
 				sketch_status = max(sketch_status, status)
+				row_data += f"<td align='center'>{TEST_STATUS[status]}</td>"
+			name_link = example_name(sketch_name)
+			if issues:
 				sketch_id = sketch_name.replace('/', '_').replace(' ', '_').replace('-', '_')
-				icon_link = f"<a href='#{sketch_id}_{board}'>{TEST_STATUS[status]}</a>" if issues else TEST_STATUS[status]
-				row_data += f"<td align='center'>{icon_link}</a></td>"
-			print(f"<tr><td>{TEST_STATUS[sketch_status]}</td><td><code>{example_name(sketch_name)}</code></td>{row_data}</tr>")
+				name_link =	f"<a href='#user-content-{artifact}_{sketch_id}'>{name_link}</a>"
+			print(f"<tr><td>{TEST_STATUS[sketch_status]}</td><td>{name_link}</td>{row_data}</tr>")
 		print("</table>\n")
 
-		print(f"<details><summary>:scroll: <b>Detailed test issues for <code>{artifact}</code></b></summary>\n")
-		print("<table>")
-		print("<tr><th>Sketch</th><th>Build Details</th></tr>")
+		sketch_log_map = {}
 		for sketch_name, board_results in artifact_matrix.items():
-			row_open = False
+			test_log_map = {}
+			sketch_status = SKIP
 			for board in artifact_boards:
 				if not board in board_results:
 					continue
@@ -261,22 +262,32 @@ def process_build_reports():
 				if not issues:
 					continue
 
-				if not row_open:
-					row_open = True
-					print(f"<tr><td>{example_name(sketch_name)}</td>")
-					print("<td>")
+				sketch_status = max(sketch_status, status)
 
 				job_link = BOARD_SUMMARY[board]['job_link']
+				test_text = f"<code>{board}</code>"
 				if job_link:
-					job_link = f" <a href='{job_link}'> :scroll:</a>"
-				sketch_id = sketch_name.replace('/', '_').replace(' ', '_').replace('-', '_')
-				print(f"<details id='{sketch_id}_{board}'><summary>{artifact_count(len(issues), status, TEST_STATUS)} <code>{board}</code>{job_link}</summary>")
-				print("\n```\n" + "\n".join(issues) + "\n```")
-				print("</details>")
+					test_text += f" (<a href='{job_link}'>full log</a>)"
+				test_text = f"<tr><td>{TEST_STATUS[status]} {test_text}<br/>"
+				test_text += "\n\n```\n" + "\n".join(issues) + "\n```\n</td></tr>"
 
-			if row_open:
-				print("</td></tr>")
-		print("</table></details>\n")
+				test_log_list = test_log_map.get(status, [])
+				test_log_list.append(test_text)
+				test_log_map[status] = test_log_list
+
+			sketch_log_list = sketch_log_map.get(status, [])
+			sketch_log_list.append((sketch_name, test_log_map))
+			sketch_log_map[status] = sketch_log_list
+
+		for sketch_status in [ERROR, EXPECTED_ERROR, WARNING]:
+			for sketch_name, test_log_map in sketch_log_map.get(sketch_status, []):
+				sketch_id = sketch_name.replace('/', '_').replace(' ', '_').replace('-', '_')
+				print(f"<a name='{artifact}_{sketch_id}'/><details name='{artifact}'><summary>Logs for {TEST_STATUS[sketch_status]} {example_name(sketch_name)}</summary>\n")
+				print("<table>")
+				for test_status in [ERROR, EXPECTED_ERROR, WARNING]:
+					for text in test_log_map.get(test_status, []):
+						print(text)
+				print("</table></details>\n")
 
 if __name__ == "__main__":
 	process_build_reports()