From b7de15bf597dfda7fea41c5363160dc173f53097 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Thu, 7 Oct 2021 11:19:30 -0700 Subject: [PATCH 1/2] [Bazel] Only persist cache and create build invocations in on-merge pipeline (#114035) Signed-off-by: Tyler Smalley --- .bazelrc | 11 ++++++----- .buildkite/scripts/lifecycle/pre_command.sh | 1 - .../scripts/steps/on_merge_build_and_metrics.sh | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index 2505bbfdf44f0..524542a02a4aa 100644 --- a/.bazelrc +++ b/.bazelrc @@ -2,12 +2,13 @@ # Import shared settings first so we can override below import %workspace%/.bazelrc.common -## Disabled for now # Remote cache settings for local env -# build --remote_cache=https://storage.googleapis.com/kibana-bazel-cache -# build --incompatible_remote_results_ignore_disk=true -# build --remote_accept_cached=true -# build --remote_upload_local_results=false +build --remote_cache=grpcs://cloud.buildbuddy.io +build --incompatible_remote_results_ignore_disk=true +build --noremote_upload_local_results +build --remote_timeout=30 +build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze +build --remote_accept_cached=true # BuildBuddy ## Metadata settings diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh index 54ed8d575b5e0..be31bb74ef668 100755 --- a/.buildkite/scripts/lifecycle/pre_command.sh +++ b/.buildkite/scripts/lifecycle/pre_command.sh @@ -89,7 +89,6 @@ if [[ "${SKIP_CI_SETUP:-}" != "true" ]]; then if [[ -d .buildkite/scripts && "${BUILDKITE_COMMAND:-}" != "buildkite-agent pipeline upload"* ]]; then source .buildkite/scripts/common/env.sh source .buildkite/scripts/common/setup_node.sh - source .buildkite/scripts/common/setup_bazel.sh fi fi diff --git a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh index 1f1e492f87bec..b24e585e70735 100755 --- a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh +++ b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh @@ -2,6 +2,9 @@ set -euo pipefail +# Write Bazel cache for Linux +.buildkite/scripts/common/setup_bazel.sh + .buildkite/scripts/bootstrap.sh .buildkite/scripts/build_kibana.sh .buildkite/scripts/post_build_kibana.sh From 50393bc3d75c3b01e1f89c90fde890cdb1505cf6 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Thu, 7 Oct 2021 11:27:52 -0700 Subject: [PATCH 2/2] [ci] Fix setup_bazel permissions Signed-off-by: Tyler Smalley --- .buildkite/scripts/common/setup_bazel.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .buildkite/scripts/common/setup_bazel.sh diff --git a/.buildkite/scripts/common/setup_bazel.sh b/.buildkite/scripts/common/setup_bazel.sh old mode 100644 new mode 100755