portage: Declare logs and trace files as individual output groups

This will make sure the logs and traces are always uploaded to sponge.

Package: http://sponge2/b6f09359-9530-4b23-b694-6a6e8a5afadd
Deps: http://sponge2/eeae493c-745d-4cfe-a6c9-6ebda1dd2759

BUG=none
TEST=BOARD=amd64-generic bazel build --config=bes --//bazel/portage:compiled-profiles @portage//internal/packages/stage1/target/host/chromiumos/sys-libs/glibc:2.35_deps

Change-Id: I876f608c39423277a5cea0d878ace979bcfc5627
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/bazel/+/5063114
Tested-by: Raul Rangel <[email protected]>
Reviewed-by: Tim Bain <[email protected]>
Commit-Queue: Tim Bain <[email protected]>
Auto-Submit: Raul Rangel <[email protected]>

Author: Raul E Rangel

bazelrcs/common.bazelrc

@@ -37,6 +37,9 @@ common --show_timestamps
 # Always show output from actions.
 common --experimental_ui_max_stdouterr_bytes=-1
 
+# Publish the individual action traces and logs
+build --output_groups=+logs,+traces
+
 # Prevent writing to the remote cache if source files change during the build.
 # **DISABLED** Only useful when uploading artifacts from local builds, which we
 # won't do once we have Bazel running in CI builds, and it prevents uploading

portage/build_defs/build_image.bzl

@@ -28,7 +28,7 @@ def _build_image_impl(ctx):
         ],
         order = "postorder",
     )
-    deps_layers = install_deps(
+    deps_layers, logs, traces = install_deps(
         ctx = ctx,
         output_prefix = ctx.attr.output_image_file_name + "-deps",
         board = ctx.attr.board,
@@ -114,7 +114,13 @@ def _build_image_impl(ctx):
         progress_message = "Building " + output_image_file.basename,
     )
 
-    return [DefaultInfo(files = depset([output_image_file, output_log_file]))]
+    return [
+        DefaultInfo(files = depset([output_image_file])),
+        OutputGroupInfo(
+            logs = depset([output_log_file] + logs),
+            traces = depset([output_profile_file] + traces),
+        ),
+    ]
 
 build_image = rule(
     implementation = _build_image_impl,

portage/build_defs/ebuild.bzl

@@ -520,10 +520,12 @@ def _ebuild_impl(ctx):
 
     return [
         DefaultInfo(files = depset(
-            [output_binary_package_file, output_log_file] +
+            [output_binary_package_file] +
             interface_library_outputs,
         )),
         OutputGroupInfo(
+            logs = depset([output_log_file]),
+            traces = depset([output_profile_file]),
             _validation = depset(validation_files),
         ),
         package_info,

portage/build_defs/install_deps.bzl

@@ -164,7 +164,7 @@ def _fast_install_packages(
         progress_message = actual_progress_message,
     )
 
-    return new_layers
+    return new_layers, [output_log_file], [output_profile_file]
 
 def install_deps(
         ctx,
@@ -214,6 +214,8 @@ def install_deps(
 
     Returns:
         list[File]: Files representing file system layers.
+        list[File]: Log files generated when building the layers.
+        list[File]: Trace files generated when building the layers.
     """
     if strategy == "fast":
         return _fast_install_packages(
@@ -285,4 +287,4 @@ def install_deps(
         progress_message = progress_message,
     )
 
-    return [output_root]
+    return [output_root], [output_log_file], [output_profile_file]

portage/build_defs/sdk.bzl

@@ -170,7 +170,7 @@ def _sdk_install_deps_impl(ctx):
         order = "postorder",
     )
 
-    outputs = install_deps(
+    layers, logs, traces = install_deps(
         ctx = ctx,
         output_prefix = ctx.attr.out or ctx.attr.name,
         board = ctx.attr.board,
@@ -187,9 +187,13 @@ def _sdk_install_deps_impl(ctx):
     )
 
     return [
-        DefaultInfo(files = depset(outputs)),
+        DefaultInfo(files = depset(layers)),
+        OutputGroupInfo(
+            logs = depset(logs),
+            traces = depset(traces),
+        ),
         SDKInfo(
-            layers = sdk.layers + outputs,
+            layers = sdk.layers + layers,
             packages = depset(transitive = [sdk.packages, install_set]),
         ),
     ]