Merge #110850 #110926

110850: codeowners: add `test-eng-prs` to `pkg/clusterversion` r=healthy-pod a=healthy-pod part of: DEVINF-509 Release note: None 110926: sql: add libgeos runfile dependency for RSG tests r=rickystewart,herkolategan a=srosenberg 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] #110129 Epic: none Fixes: #110780 Release note: None Co-authored-by: healthy-pod <[email protected]> Co-authored-by: Stan Rosenberg <[email protected]>
cockroachdb · Sep 19, 2023 · a499165 · a499165
3 parents 0924ffe + f4b2cc4 + 4a65030
commit a499165
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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:

diff --git 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
@@ -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,