fixup! ui: reintroduce end-to-end UI tests with cypress

fix imports in teamcity scripts
cockroachdb · Aug 1, 2022 · 046d776 · 046d776
1 parent a9d0635
commit 046d776
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/build/teamcity/cockroach/ci/tests/ui_e2e_test_all.sh b/build/teamcity/cockroach/ci/tests/ui_e2e_test_all.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-source "$(dirname "${0}")/teamcity-support.sh"
-source "./ui_e2e_test_impl.sh"
+build="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
+# for tc_prepare, tc_start_block, and friends
+source "$build/teamcity-support.sh"
+# for build_docker_image and run_tests
+source "$build/teamcity/cockroach/ci/tests/ui_e2e_test_impl.sh"
 
 tc_prepare
 

diff --git a/build/teamcity/cockroach/ci/tests/ui_e2e_test_health.sh b/build/teamcity/cockroach/ci/tests/ui_e2e_test_health.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-source "$(dirname "${0}")/teamcity-support.sh"
-source "./ui_e2e_test_impl.sh"
+build="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
+# for tc_prepare, tc_start_block, and friends
+source "$build/teamcity-support.sh"
+# for build_docker_image and run_tests
+source "$build/teamcity/cockroach/ci/tests/ui_e2e_test_impl.sh"
 
 tc_prepare
 

diff --git a/build/teamcity/cockroach/ci/tests/ui_e2e_test_impl.sh b/build/teamcity/cockroach/ci/tests/ui_e2e_test_impl.sh
@@ -11,7 +11,7 @@ function build_docker_image() {
 
 function run_tests() {
   SPEC_ARG=""
-  if [ "health" = "${$1:='EMPTY'}" ]; then
+  if [ "health" = "${1:-'EMPTY'}" ]; then
     SPEC_ARG="--spec 'cypress/e2e/health-check/**'"
   fi