commit 4feb237ba806ed22f4ef5005f6239e9cda81af91
author Lizzy Presland <zland@google.com> Thu Jan 20 05:16:30 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Feb 01 10:51:45 2022 +0000
tree 387c01a077ab85aa1577fcb6628d8cbc58f79fd9
parent c3bedb4902d45791bdf9e24586470770f2d04b7b

api: Provide pkg logs in BuildTargetUnitTest

Some builders have package build failures in the BuildTargetUnitTest
CI step, and this CL provides the package log locations in these cases.

BUG=b:204816060
TEST=./run_tests
TEST=cq forthcoming

Change-Id: I7ad627f51a2fefdccd4555641be554f669a7e952
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3404957
Reviewed-by: Cindy Lin <xcl@google.com>
Commit-Queue: Lizzy Presland <zland@google.com>
Tested-by: Lizzy Presland <zland@google.com>
Auto-Submit: Lizzy Presland <zland@google.com>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index e1cafe1..20bfd81 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -78,6 +78,9 @@
     pkg_info = package_info.parse(pkg)
     pkg_info_msg = output_proto.failed_packages.add()
     controller_util.serialize_package_info(pkg_info, pkg_info_msg)
+    failed_pkg_data_msg = output_proto.failed_package_data.add()
+    controller_util.serialize_package_info(pkg_info, failed_pkg_data_msg.name)
+    failed_pkg_data_msg.log_path.path = '/path/to/%s/log' % pkg
 
 
 @faux.success(_BuildTargetUnitTestResponse)
@@ -120,6 +123,8 @@
 
   code_coverage = input_proto.flags.code_coverage
 
+  sysroot = sysroot_lib.Sysroot(build_target.root)
+
   result = test.BuildTargetUnitTest(
       build_target,
       chroot,
@@ -131,17 +136,17 @@
       filter_only_cros_workon=filter_only_cros_workon)
 
   if not result.success:
-    # Failed to run tests or some tests failed.
-    # Record all failed packages.
-    for pkg_info in result.failed_pkgs:
-      package_info_msg = output_proto.failed_packages.add()
-      controller_util.serialize_package_info(pkg_info, package_info_msg)
+    # Record all failed packages and retrieve log locations.
+    controller_util.retrieve_package_log_paths(
+        sysroot_lib.PackageInstallError('error installing packages',
+                                        cros_build_lib.CommandResult(),
+                                        packages=result.failed_pkgs),
+        output_proto, sysroot)
     if result.failed_pkgs:
       return controller.RETURN_CODE_UNSUCCESSFUL_RESPONSE_AVAILABLE
     else:
       return controller.RETURN_CODE_COMPLETED_UNSUCCESSFULLY
 
-  sysroot = sysroot_lib.Sysroot(build_target.root)
   tarball = test.BuildTargetUnitTestTarball(chroot, sysroot, result_path)
   if tarball:
     output_proto.tarball_path = tarball