Merge #122997

122997: ui_test: fix AWS ui test build configuration r=celiala a=rickystewart This was broken by #122048. Epic: none Release note: None Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Apr 24, 2024 · 9bf7bfe · 9bf7bfe
2 parents fb032b8 + edc5c24
commit 9bf7bfe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test.sh b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test.sh
@@ -2,4 +2,11 @@
 
 set -euo pipefail
 
-source build/teamcity/cockroach/ci/tests/ui_test.sh
+dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
+
+source "$dir/teamcity-support.sh"  # For $root
+source "$dir/teamcity-bazel-support.sh"  # For run_bazel
+
+tc_start_block "Run UI tests"
+run_bazel build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh
+tc_end_block "Run UI tests"
diff --git a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+bazel build //pkg/cmd/bazci --config=ci
+$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci //pkg/ui:test