[ci] Explicitly enable writing Bazel cache

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Author: Tyler Smalley

.buildkite/scripts/common/setup_bazel.sh

@@ -5,20 +5,10 @@ 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" "$HOME/.bazelrc"
+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/setup_bazel.sh" >> "$HOME/.bazelrc"
+echo "# Appended by .buildkite/scripts/setup_bazel.sh" >> "$KIBANA_DIR/.bazelrc"
 echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
-
-###
-### remove write permissions on buildbuddy remote cache for prs
-###
-if [[ "${BUILDKITE_PULL_REQUEST:-}" && "$BUILDKITE_PULL_REQUEST" != "false" ]] ; then
-  {
-    echo "# Uploads logs & artifacts without writing to cache"
-    echo "build --noremote_upload_local_results"
-  } >> "$HOME/.bazelrc"
-fi

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/setup_bazel.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"