[7.x] [ci] Fixes Bazel cache writes (#114915)

.buildkite/scripts/common/persist_bazel_cache.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/common/util.sh
+
+KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
+export KIBANA_BUILDBUDDY_CI_API_KEY
+
+cp "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$KIBANA_DIR/.bazelrc"
+
+###
+### append auth token to buildbuddy into "$HOME/.bazelrc";
+###
+echo "# Appended by .buildkite/scripts/persist_bazel_cache.sh" >> "$KIBANA_DIR/.bazelrc"
+echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$KIBANA_DIR/.bazelrc"

.buildkite/scripts/steps/on_merge_build_and_metrics.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Write Bazel cache for Linux
-.buildkite/scripts/common/setup_bazel.sh
+.buildkite/scripts/common/persist_bazel_cache.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/build_kibana.sh

src/dev/ci_setup/.bazelrc-ci

@@ -1,16 +1,15 @@
-# Inspired on https://github.com/angular/angular/blob/master/.circleci/bazel.linux.rc
-# These options are only enabled when running on CI
-# That is done by copying this file into "$HOME/.bazelrc" which loads after the .bazelrc into the workspace
+# Used in the on-merge job to persist the Bazel cache to BuildBuddy
+# from: .buildkite/scripts/common/persist_bazel_cache.sh
 
-# Import and load bazelrc common settings for ci env
-try-import %workspace%/src/dev/ci_setup/.bazelrc-ci.common
+import %workspace%/.bazelrc.common
 
 # BuildBuddy settings
-## Remote settings including cache
 build --bes_results_url=https://app.buildbuddy.io/invocation/
 build --bes_backend=grpcs://cloud.buildbuddy.io
 build --remote_cache=grpcs://cloud.buildbuddy.io
 build --remote_timeout=3600
+# --remote_header=x-buildbuddy-api-key= # appended in CI script
 
-## Metadata settings
+# Metadata settings
 build --build_metadata=ROLE=CI
+build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"