From 98e83c444fa58669d45ecf162cf4bf48dce790d1 Mon Sep 17 00:00:00 2001
From: Brad Burlage <brb@google.com>
Date: Thu, 23 Jan 2020 10:58:18 -0800
Subject: Try running kythe build on RBE.

Also add our RBE project/instance to the --config=remote defaults.

PiperOrigin-RevId: 291201426
---
 .bazelrc                       | 20 +++++++-------------
 kokoro/kythe/generate_xrefs.sh |  3 ++-
 scripts/common_bazel.sh        |  9 +--------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 7f87e94b1..9c35c5e7b 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -20,6 +20,13 @@ build --stamp --workspace_status_command tools/workspace_status.sh
 
 # Enable remote execution so actions are performed on the remote systems.
 build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
+build:remote --project_id=gvisor-rbe
+build:remote --remote_instance_name=projects/gvisor-rbe/instances/default_instance
+# Enable authentication. This will pick up application default credentials by
+# default. You can use --google_credentials=some_file.json to use a service
+# account credential instead.
+build:remote --google_default_credentials=true
+build:remote --auth_scope="https://www.googleapis.com/auth/cloud-source-tools"
 
 # Add a custom platform and toolchain that builds in a privileged docker
 # container, which is required by our syscall tests.
@@ -27,25 +34,12 @@ build:remote --host_platform=//test:rbe_ubuntu1604
 build:remote --extra_toolchains=//test:cc-toolchain-clang-x86_64-default
 build:remote --extra_execution_platforms=//test:rbe_ubuntu1604
 build:remote --platforms=//test:rbe_ubuntu1604
-
-# Use default image for crosstool toolchain.
 build:remote --crosstool_top=@rbe_default//cc:toolchain
-
-# Default parallelism and timeout for remote jobs.
 build:remote --jobs=50
 build:remote --remote_timeout=3600
-
 # RBE requires a strong hash function, such as SHA256.
 startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
 
-# Enable authentication. This will pick up application default credentials by
-# default. You can use --google_credentials=some_file.json to use a service
-# account credential instead.
-build:remote --google_default_credentials=true
-
-# Auth scope needed for authentication with RBE.
-build:remote --auth_scope="https://www.googleapis.com/auth/cloud-source-tools"
-
 # Set flags for uploading to BES in order to view results in the Bazel Build
 # Results UI.
 build:results --bes_backend="buildeventservice.googleapis.com"
diff --git a/kokoro/kythe/generate_xrefs.sh b/kokoro/kythe/generate_xrefs.sh
index 799467a34..d2ca95c68 100644
--- a/kokoro/kythe/generate_xrefs.sh
+++ b/kokoro/kythe/generate_xrefs.sh
@@ -25,7 +25,7 @@ bazel version
 
 python3 -V
 
-readonly KYTHE_VERSION='v0.0.37'
+readonly KYTHE_VERSION='v0.0.39'
 readonly WORKDIR="$(mktemp -d)"
 readonly KYTHE_DIR="${WORKDIR}/kythe-${KYTHE_VERSION}"
 if [[ -n "$KOKORO_GIT_COMMIT" ]]; then
@@ -47,6 +47,7 @@ bazel \
   --override_repository kythe_release="${KYTHE_DIR}" \
   --define=kythe_corpus=gvisor.dev \
   --cxxopt=-std=c++17 \
+  --config=remote \
   //...
 
 "${KYTHE_DIR}/tools/kzip" merge \
diff --git a/scripts/common_bazel.sh b/scripts/common_bazel.sh
index bbc1a038e..a473a88a4 100755
--- a/scripts/common_bazel.sh
+++ b/scripts/common_bazel.sh
@@ -32,18 +32,11 @@ declare -r BAZEL_FLAGS=(
   "--keep_going"
   "--verbose_failures=true"
 )
-if [[ -v KOKORO_BAZEL_AUTH_CREDENTIAL ]] || [[ -v RBE_PROJECT_ID ]]; then
-  declare -r RBE_PROJECT_ID="${RBE_PROJECT_ID:-gvisor-rbe}"
-  declare -r BAZEL_RBE_FLAGS=(
-    "--config=remote"
-    "--project_id=${RBE_PROJECT_ID}"
-    "--remote_instance_name=projects/${RBE_PROJECT_ID}/instances/default_instance"
-  )
-fi
 if [[ -v KOKORO_BAZEL_AUTH_CREDENTIAL ]]; then
   declare -r BAZEL_RBE_AUTH_FLAGS=(
     "--auth_credentials=${KOKORO_BAZEL_AUTH_CREDENTIAL}"
   )
+  declare -r BAZEL_RBE_FLAGS=("--config=remote")
 fi
 
 # Wrap bazel.
-- 
cgit v1.2.3