From 901f014a343fad4e43df7a3574deced4c4ecbf81 Mon Sep 17 00:00:00 2001
From: Greg Magolan <greg@aspect.dev>
Date: Fri, 24 Nov 2023 04:31:26 -0800
Subject: [PATCH] build: fix CI bazelrc settings for Aspect Workflows warming
 (#58550)

---
 .aspect/bazelrc/ci.sourcegraph.bazelrc | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.aspect/bazelrc/ci.sourcegraph.bazelrc b/.aspect/bazelrc/ci.sourcegraph.bazelrc
index fa918f21f0a..98307106d9f 100644
--- a/.aspect/bazelrc/ci.sourcegraph.bazelrc
+++ b/.aspect/bazelrc/ci.sourcegraph.bazelrc
@@ -5,47 +5,47 @@ try-import %workspace%/.aspect/bazelrc/ci.generated.bazelrc
 # Use repo caching for building and testing.
 # Article: https://buildkite.com/blog/how-bazel-built-its-ci-system-on-top-of-buildkite
 # Docs: https://bazel.build/reference/command-line-reference#flag--repository_cache
-build --repository_cache=/home/buildkite/repocache-sourcegraph
+common --repository_cache=/home/buildkite/repocache-sourcegraph
 
 # We need /usr/local/bin
 # TODO(DevX) we should be narrower here.
-build --test_env=PATH
+common --test_env=PATH
 
 # Needed for DB in CI
-test --test_env=PGUSER=postgres
-test --test_env=PGPASSWORD=postgres
-test --test_env=PGSSLMODE=disable
-test --test_env=PGDATABASE=postgres
+common --test_env=PGUSER=postgres
+common --test_env=PGPASSWORD=postgres
+common --test_env=PGSSLMODE=disable
+common --test_env=PGDATABASE=postgres
 
 # Allow tests to understand they're running in CI, which forces dbtest to drop database even in case of failures.
 # TODO(JH) we should instead wipe all templates after a job finishes.
-build --test_env=CI
+common --test_env=CI
 
 # Ensure we're not exhausting database connections.
-build --test_env=GOMAXPROCS=10
-build --test_env=TESTDB_MAXOPENCONNS=15
+common --test_env=GOMAXPROCS=10
+common --test_env=TESTDB_MAXOPENCONNS=15
 
 # Needed for E2E
-build --test_env=BUILDKITE
+common --test_env=BUILDKITE
 
 # Needed for mocha tests
 # We have to use the `--define` flag here instead of `--test_env` because
 # the mocha tests target is the build target and it's tested with `build_test`.
-test --define=E2E_HEADLESS=false
+common --define=E2E_HEADLESS=false
 # if we set this to localhost, chrome will refuse to conenct since local host is in its HTTP Strict Transport Security
 # by setting the loopback address we get passed that
-test --define=E2E_SOURCEGRAPH_BASE_URL="http://127.0.0.1:7080"
-test --define=DISPLAY=:99
+common --define=E2E_SOURCEGRAPH_BASE_URL="http://127.0.0.1:7080"
+common --define=DISPLAY=:99
 
 # Provides git commit, branch information to build targets like Percy via status file.
 # https://bazel.build/docs/user-manual#workspace-status
-build --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh
+common --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh
 
 # temp
-build --test_env=INCLUDE_ADMIN_ONBOARDING=false
+common --test_env=INCLUDE_ADMIN_ONBOARDING=false
 
 # Used for container_structure_tests
-build --test_env=DOCKER_HOST
+common --test_env=DOCKER_HOST
 
 # Used by migration rules
-build --action_env=PGUSER=postgres
+common --action_env=PGUSER=postgres