ci: try gcloud resultstore (envoyproxy#20729)

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
LeonGao91 · May 5, 2022 · 4734f0e · 4734f0e
1 parent 697db5f
commit 4734f0e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/.azure-pipelines/bazel.yml b/.azure-pipelines/bazel.yml
@@ -48,11 +48,11 @@ steps:
     REPO_URI: $(Build.Repository.Uri)
     BUILD_URI: $(Build.BuildUri)
     ${{ if parameters.rbe }}:
+      GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
       ENVOY_RBE: "1"
       BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) ${{ parameters.bazelBuildExtraOptions }}"
       BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
       BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
-      GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
     ${{ if eq(parameters.rbe, false) }}:
       BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}"
       BAZEL_REMOTE_CACHE: $(LocalBuildCache)

diff --git a/.bazelrc b/.bazelrc
@@ -318,6 +318,10 @@ build:docker-tsan --config=rbe-toolchain-tsan
 build:remote-ci --remote_cache=grpcs://remotebuildexecution.googleapis.com
 build:remote-ci --remote_executor=grpcs://remotebuildexecution.googleapis.com
 
+# Build Event Service
+build:google-bes --bes_backend=grpcs://buildeventservice.googleapis.com
+build:google-bes --bes_results_url=https://source.cloud.google.com/results/invocations/
+
 # Fuzz builds
 
 # Shared fuzzing configuration.

diff --git a/ci/build_setup.sh b/ci/build_setup.sh
@@ -99,7 +99,6 @@ BAZEL_BUILD_OPTIONS=(
   "--noshow_loading_progress"
   "--repository_cache=${BUILD_DIR}/repository_cache"
   "--experimental_repository_cache_hardlinks"
-  "--ui_event_filters=-info"
   "${BAZEL_BUILD_EXTRA_OPTIONS[@]}"
   "${BAZEL_EXTRA_TEST_OPTIONS[@]}")
 

diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
@@ -81,6 +81,7 @@ docker run --rm \
        -e ENVOY_STDLIB \
        -e BUILD_REASON \
        -e BAZEL_REMOTE_INSTANCE \
+       -e GOOGLE_BES_PROJECT_ID \
        -e GCP_SERVICE_ACCOUNT_KEY \
        -e NUM_CPUS \
        -e ENVOY_RBE \

diff --git a/ci/setup_cache.sh b/ci/setup_cache.sh
@@ -17,6 +17,11 @@ if [[ -n "${GCP_SERVICE_ACCOUNT_KEY:0:1}" ]]; then
   bash -c 'echo "${GCP_SERVICE_ACCOUNT_KEY}"' | base64 --decode > "${GCP_SERVICE_ACCOUNT_KEY_FILE}"
 
   export BAZEL_BUILD_EXTRA_OPTIONS+=" --google_credentials=${GCP_SERVICE_ACCOUNT_KEY_FILE}"
+
+  if [[ -n "${GOOGLE_BES_PROJECT_ID}" ]]; then
+    export BAZEL_BUILD_EXTRA_OPTIONS+=" --config=google-bes --bes_instance_name=${GOOGLE_BES_PROJECT_ID}"
+  fi
+
 fi