testing: remove btlr binary (GoogleCloudPlatform#8809)

Takashi Matsuo · parthea · web-flow · commit 323dd14c6bcf · 2022-12-16T03:16:02.000-06:00
fixes GoogleCloudPlatform#8805 Co-authored-by: Anthonios Partheniou <partheniou@google.com>
diff --git a/.kokoro/lint/common.cfg b/.kokoro/lint/common.cfg
@@ -29,6 +29,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/python2.7/common.cfg b/.kokoro/python2.7/common.cfg
@@ -31,6 +31,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/python3.10/common.cfg b/.kokoro/python3.10/common.cfg
@@ -31,6 +31,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/python3.7/common.cfg b/.kokoro/python3.7/common.cfg
@@ -31,6 +31,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/python3.8/common.cfg b/.kokoro/python3.8/common.cfg
@@ -31,6 +31,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/python3.9/common.cfg b/.kokoro/python3.9/common.cfg
@@ -31,6 +31,9 @@ build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
 # Copy results for Resultstore
 action {
   define_artifacts {
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -19,6 +19,13 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
+# If on kokoro, add btlr to the path
+if [ -n "$KOKORO_GFILE_DIR" ]; then
+  bltr_dir="$KOKORO_GFILE_DIR/v0.0.3/"
+  chmod +x "${bltr_dir}"btlr
+  export PATH="$PATH:$bltr_dir"
+fi
+
 DIFF_FROM=""
 
 # `--only-diff-main` will only run tests on project changes on the
@@ -176,9 +183,9 @@ btlr_args+=(
     "${test_prog}"
 )
 
-echo "testing/btlr" "${btlr_args[@]}"
+echo "btlr" "${btlr_args[@]}"
 
-testing/btlr "${btlr_args[@]}"
+btlr "${btlr_args[@]}"
 
 RTN=$?
 cd "$ROOT"
diff --git a/testing/btlr b/testing/btlr
