From f4b2cc4bb26204fd44809f010229dd14a9d22808 Mon Sep 17 00:00:00 2001
From: healthy-pod <ahmad@cockroachlabs.com>
Date: Mon, 18 Sep 2023 12:00:51 -0700
Subject: [PATCH 1/2] codeowners: add `test-eng-prs` to `pkg/clusterversion`

part of: DEVINF-509
Release note: None
---
 .github/CODEOWNERS | 2 +-
 TEAMS.yaml         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 10224d85f69b..d0d0cdcfecc7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -401,7 +401,7 @@
 #!/pkg/ccl/utilccl/          @cockroachdb/unowned
 /pkg/ccl/workloadccl/        @cockroachdb/test-eng #! @cockroachdb/sql-foundations-noreview
 /pkg/ccl/benchccl/rttanalysisccl/     @cockroachdb/sql-foundations
-#!/pkg/clusterversion/       @cockroachdb/dev-inf-noreview  @cockroachdb/kv-prs-noreview
+#!/pkg/clusterversion/       @cockroachdb/dev-inf-noreview  @cockroachdb/kv-prs-noreview @cockroachdb/test-eng-prs
 /pkg/cmd/allocsim/           @cockroachdb/kv-prs
 /pkg/cmd/bazci/              @cockroachdb/dev-inf
 /pkg/cmd/cloudupload/        @cockroachdb/dev-inf
diff --git a/TEAMS.yaml b/TEAMS.yaml
index ef855167887f..ad8660c6febf 100644
--- a/TEAMS.yaml
+++ b/TEAMS.yaml
@@ -66,6 +66,9 @@ cockroachdb/storage:
 cockroachdb/test-eng:
   triage_column_id: 14041337
   label: T-testeng
+cockroachdb/test-eng-prs:
+  triage_column_id: 14041337
+  label: T-testeng
 cockroachdb/security:
   label: T-cross-product-security
 cockroachdb/prodsec:

From 4a65030a68f950582988f9ef227a8d937b9924b6 Mon Sep 17 00:00:00 2001
From: Stan Rosenberg <stan.rosenberg@gmail.com>
Date: Tue, 19 Sep 2023 15:14:50 -0400
Subject: [PATCH 2/2] sql: add libgeos runfile dependency for RSG tests

In [1], we updated CI (nightly) to require a build
step for `//c-deps:libgeos`. That didn't fix `rsg_test`'s
implicit dependency on libgeos, since the produced artifacts
are not reachable from the test sandbox.

Instead, we use a runfile dependency--same way other
test packages specify libgeos dependency. This enables
dynamic loading via `bazel.Runfile`.

[1] https://github.com/cockroachdb/cockroach/pull/110129

Epic: none
Fixes: #110780

Release note: None
---
 .../teamcity/cockroach/nightlies/random_syntax_tests_impl.sh  | 1 -
 pkg/sql/tests/BUILD.bazel                                     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
index 48523b757e55..60d2e5ed197f 100755
--- a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
+++ b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
@@ -4,7 +4,6 @@ set -xeuo pipefail
 
 dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))"
 
-bazel build --config ci --config force_build_cdeps //c-deps:libgeos
 bazel build //pkg/cmd/bazci --config=ci
 BAZEL_BIN=$(bazel info bazel-bin --config=ci)
 exit_status=0
diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel
index 846617b1b2b8..818d08501531 100644
--- a/pkg/sql/tests/BUILD.bazel
+++ b/pkg/sql/tests/BUILD.bazel
@@ -62,7 +62,9 @@ go_test(
         "//build/toolchains:use_ci_timeouts": ["-test.timeout=895s"],
         "//conditions:default": ["-test.timeout=3595s"],
     }),
-    data = glob(["testdata/**"]),
+    data = glob(["testdata/**"]) + [
+        "//c-deps:libgeos",  # keep
+    ],
     embed = [":tests"],
     exec_properties = {"Pool": "large"},
     shard_count = 16,