UTOF support

Author: alopezz

.gitlab/build/bazel/test.yml

@@ -15,16 +15,18 @@
   variables:
     EXTERNAL_LINKS_PATH: external_links_$CI_JOB_ID.json
     BEP_FILE: $CI_PROJECT_DIR/bazel-bep.json
-    RESULT_JSON: output.json
+    RESULT_JSON: test_output.json
   after_script:
     - dda inv -- -e bazel.process-test-results --bep-file=$BEP_FILE --junit-tar=junit-${CI_JOB_NAME}.tgz --result-json=$RESULT_JSON
     - !reference [.upload_junit_source]
   artifacts:
     expire_in: 2 weeks
     when: always
     paths:
+      - $RESULT_JSON
+      - test_output_unified.json
       - junit-*.tgz
-      - bazel-bep-*.json
+      - bazel-bep.json
     reports:
       annotations:
         - $EXTERNAL_LINKS_PATH
@@ -65,8 +67,10 @@ bazel:test:macos-arm64:
     - !reference [.bazel:test:reporting, after_script]
   artifacts:
     paths:
+      - $RESULT_JSON
+      - test_output_unified.json
       - junit-*.tgz
-      - bazel-bep-*.json
+      - bazel-bep.json
       - bazel-exec.log
 
 # Windows splits the build from the Go tests, unlike the other platforms: the

tasks/bazel.py

@@ -319,8 +319,8 @@ def ensure_test_parity(ctx, bep, flavor_name, verbose=False, emit_metrics=False)
 
 class BepTestArtifacts(TypedDict):
     cached: bool
-    xml_paths: list[Path]
-    log_paths: list[Path]
+    xml_paths: list[Path]  # noqa: F841 - TypedDict field, not a local variable
+    log_paths: list[Path]  # noqa: F841 - TypedDict field, not a local variable
 
 
 def _resolve_test_output_path(
@@ -488,8 +488,10 @@ def _collect_test2json(ctx, test_artifacts, output_path):
     with tempfile.TemporaryDirectory() as tmpdir:
         manifest_path = os.path.join(tmpdir, "manifest.tsv")
         with open(manifest_path, "w") as manifest:
-            for entry in sorted(test_artifacts.keys()):
-                manifest.writelines(f'{entry}\t{log_path}\n' for log_path in test_artifacts[entry]["log_paths"])
+            for import_path in sorted(test_artifacts.keys()):
+                manifest.writelines(
+                    f'{import_path}\t{log_path}\n' for log_path in test_artifacts[import_path]["log_paths"]
+                )
 
         bazel(
             ctx,
@@ -506,23 +508,31 @@ def _collect_test2json(ctx, test_artifacts, output_path):
 @task(
     help={
         "bep_file": "Path to a Bazel BEP JSON file (--build_event_json_file) used to gather all necessary data.",
+        "result_json": "Path to write test2json JSONL output.",
+        "junit_tar": "Path to write the JUnit tgz.",
     },
 )
-def process_test_results(ctx, bep_file, result_json, junit_tar):
+def process_test_results(ctx, bep_file, result_json="test_output.json", junit_tar=""):
     """Collect results from Bazel-run tests and produce various artifacts.
 
     This task:
     - Produces a tgz JUnit XML file compatible with our existing upload machinery.
     - Produces a test2json file with test results and a UTOF json file created from it.
     - Displays test results in a human-friendly way (based on UTOF).
     """
-    # BEP is the authoritative source: it lists exactly the test.xml and test.out files
+    # BEP is the authoritative source: it lists exactly the test.xml and test.log files
     # produced by this invocation, avoiding stale results from previous runs
     # with a different Bazel configuration.
     test_artifacts = _parse_bep(Path(bep_file))
 
-    # Produce the junit tar
-    _collect_junit(test_artifacts, junit_tar)
-
     # Produce the test2json result file
     _collect_test2json(ctx, test_artifacts, result_json)
+
+    # Produce UTOF and associated terminal output
+    from tasks.libs.testing.utof.go.generate import generate_unified_output
+
+    generate_unified_output(ctx, result_json, "bazel", "")
+
+    # Produce the junit tar
+    if junit_tar:
+        _collect_junit(test_artifacts, junit_tar)

tasks/unit_tests/bazel_tests.py

@@ -12,7 +12,7 @@
     _is_gotestsum_shaped,
     _label_to_import_path,
     _parse_bep,
-    _test_xml_candidates,
+    _test_output_candidates,
     _test_xml_funcs,
 )
 
@@ -30,26 +30,28 @@ def test_root_package(self):
 
 class TestTestXmlCandidates(unittest.TestCase):
     def test_file_uri_only(self):
-        paths = _test_xml_candidates("//pkg/foo:bar_test", "file:///tmp/test.xml", "cfg1", None, {})
+        paths = _test_output_candidates("//pkg/foo:bar_test", "file:///tmp/test.xml", "cfg1", None, {}, "test.xml")
         self.assertEqual(paths, [Path("/tmp/test.xml")])
 
     def test_bytestream_uri_reconstructed_from_testlogs(self):
-        paths = _test_xml_candidates(
+        paths = _test_output_candidates(
             "//pkg/foo:bar_test",
             "bytestream://example/blobs/abc/123",
             "cfg1",
             "/exec/root",
             {"cfg1": Path("bazel-out/k8-fastbuild/testlogs")},
+            "test.xml",
         )
         self.assertEqual(paths, [Path("/exec/root/bazel-out/k8-fastbuild/testlogs/pkg/foo/bar_test/test.xml")])
 
     def test_both_candidates_in_priority_order(self):
-        paths = _test_xml_candidates(
+        paths = _test_output_candidates(
             "//pkg/foo:bar_test",
             "file:///tmp/test.xml",
             "cfg1",
             "/exec/root",
             {"cfg1": Path("bazel-out/k8-fastbuild/testlogs")},
+            "test.xml",
         )
         self.assertEqual(
             paths,
@@ -60,8 +62,8 @@ def test_both_candidates_in_priority_order(self):
         )
 
     def test_no_candidates_when_config_unknown(self):
-        paths = _test_xml_candidates(
-            "//pkg/foo:bar_test", "bytestream://example/blobs/abc/123", "cfg1", "/exec/root", {}
+        paths = _test_output_candidates(
+            "//pkg/foo:bar_test", "bytestream://example/blobs/abc/123", "cfg1", "/exec/root", {}, "test.xml"
         )
         self.assertEqual(paths, [])