From d6d5f1c191553b0a8a2a9309f921ebdb400cc98e Mon Sep 17 00:00:00 2001
From: Mustafa Gezen <mustafa@ctrliq.com>
Date: Sun, 30 Oct 2022 06:55:36 +0100
Subject: [PATCH] Use remote downloader during fetch

---
 .bazelrc            | 5 +++--
 hack/bazel_setup.sh | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index c8ad09c..a794dd5 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -16,8 +16,9 @@ build:toplevel --config=inmemory
 build:toplevel --remote_download_outputs=toplevel
 
 build:remote --config=toplevel
-build:remote --remote_cache=grpc://buildcache.default.svc.cluster.local:9092
-build:remote --experimental_remote_downloader=grpc://buildcache.default.svc.cluster.local:9092
+build:remote --remote_cache=grpc://buildcache.default.svc.cluster.local:9092 --experimental_remote_downloader=grpc://buildcache.default.svc.cluster.local:9092
+query:remote --remote_cache=grpc://buildcache.default.svc.cluster.local:9092 --experimental_remote_downloader=grpc://buildcache.default.svc.cluster.local:9092
+fetch:remote --remote_cache=grpc://buildcache.default.svc.cluster.local:9092 --experimental_remote_downloader=grpc://buildcache.default.svc.cluster.local:9092
 build:remote --noremote_upload_local_results
 build:remote --remote_timeout=3600
 build:remote --bes_results_url=https://bz.build.resf.org/invocation/
diff --git a/hack/bazel_setup.sh b/hack/bazel_setup.sh
index 2b0f6b9..35787f5 100644
--- a/hack/bazel_setup.sh
+++ b/hack/bazel_setup.sh
@@ -4,13 +4,15 @@ export SILO_KEY=rocky86-peridot-prow-1
 export REMOTE_DEF=cache-silo-key=$SILO_KEY
 
 CI=${CI:-}
+QUERY_FLAGS=""
 FLAGS="--show_progress_rate_limit=5 --color=yes --ui_actions_shown=30 --terminal_columns=140 --show_timestamps --verbose_failures --announce_rc --experimental_repository_cache_hardlinks --disk_cache= --sandbox_tmpfs_path=/tmp --experimental_guard_against_concurrent_changes"
 
 if [[ -n ${CI} ]]; then
   FLAGS="--config=ci $FLAGS"
+  QUERY_FLAGS="--config=ci"
 fi
 
 BAZEL_B="bazel $SOPTIONS build $FLAGS --remote_default_exec_properties=$REMOTE_DEF"
 BAZEL_R="bazel $SOPTIONS run $FLAGS --remote_default_exec_properties=$REMOTE_DEF"
 BAZEL_T="bazel $SOPTIONS test $FLAGS --remote_default_exec_properties=$REMOTE_DEF --test_arg=-test.v --flaky_test_attempts=3 --build_tests_only --test_output=errors"
-BAZEL_QR="bazel $SOPTIONS query --keep_going --noshow_progress"
+BAZEL_QR="bazel $SOPTIONS query $QUERY_FLAGS --keep_going --noshow_progress"