Skip to content

ci: add non-us region to speech quickstart #14848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scotthart merged 1 commit into from
Nov 19, 2024
Merged

ci: add non-us region to speech quickstart #14848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/cloudbuild/builds/lib/integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ function integration::bazel_args() {
# Common settings
"--test_env=GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT}"
"--test_env=GOOGLE_CLOUD_CPP_TEST_REGION=${GOOGLE_CLOUD_CPP_TEST_REGION}"
"--test_env=GOOGLE_CLOUD_CPP_NON_US_TEST_REGION=${GOOGLE_CLOUD_CPP_NON_US_TEST_REGION}"
"--test_env=GOOGLE_CLOUD_CPP_TEST_ZONE=${GOOGLE_CLOUD_CPP_TEST_ZONE}"
"--test_env=GOOGLE_CLOUD_CPP_TEST_ORGANIZATION=${GOOGLE_CLOUD_CPP_TEST_ORGANIZATION}"
"--test_env=GOOGLE_CLOUD_CPP_TEST_SERVICE_ACCOUNT_KEYFILE=${GOOGLE_CLOUD_CPP_TEST_SERVICE_ACCOUNT_KEYFILE}"
Expand Down
2 changes: 2 additions & 0 deletions ci/etc/integration-tests-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export GOOGLE_CLOUD_CPP_USER_PROJECT="${GOOGLE_CLOUD_PROJECT}"
export GOOGLE_CLOUD_CPP_TEST_REGION="us-central1"
# Some quickstart programs require a zone.
export GOOGLE_CLOUD_CPP_TEST_ZONE="us-central1-a"
# Some tests and quickstarts benefit from a region outside the US.
export GOOGLE_CLOUD_CPP_NON_US_TEST_REGION="asia-southeast1"
# Some tests and quickstarts need to specify a location as "global".
export GOOGLE_CLOUD_CPP_TEST_GLOBAL="global"
# Some quickstart programs require an organization.
Expand Down
29 changes: 18 additions & 11 deletions google/cloud/speech/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,28 @@ if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
add_executable(speech_quickstart "quickstart/quickstart.cc")
target_link_libraries(speech_quickstart PRIVATE google-cloud-cpp::speech)
google_cloud_cpp_add_common_options(speech_quickstart)
# TODO(#14841): add this back when the test on CI is recovered.

# add_test( NAME speech_quickstart_global COMMAND cmake -P
# "${PROJECT_SOURCE_DIR}/cmake/quickstart-runner.cmake"
# $<TARGET_FILE:speech_quickstart> GOOGLE_CLOUD_PROJECT
# GOOGLE_CLOUD_CPP_TEST_GLOBAL)
# set_tests_properties(speech_quickstart_global PROPERTIES LABELS
# "integration-test;quickstart")
add_test(
NAME speech_quickstart_regional
NAME speech_quickstart_global
COMMAND
cmake -P "${PROJECT_SOURCE_DIR}/cmake/quickstart-runner.cmake"
$<TARGET_FILE:speech_quickstart> GOOGLE_CLOUD_PROJECT
GOOGLE_CLOUD_CPP_TEST_GLOBAL)
set_tests_properties(speech_quickstart_global
PROPERTIES LABELS "integration-test;quickstart")
add_test(
NAME speech_quickstart_us_regional
COMMAND
cmake -P "${PROJECT_SOURCE_DIR}/cmake/quickstart-runner.cmake"
$<TARGET_FILE:speech_quickstart> GOOGLE_CLOUD_PROJECT
GOOGLE_CLOUD_CPP_TEST_REGION)
set_tests_properties(speech_quickstart_regional
set_tests_properties(speech_quickstart_us_regional
PROPERTIES LABELS "integration-test;quickstart")
add_test(
NAME speech_quickstart_non_us_regional
COMMAND
cmake -P "${PROJECT_SOURCE_DIR}/cmake/quickstart-runner.cmake"
$<TARGET_FILE:speech_quickstart> GOOGLE_CLOUD_PROJECT
GOOGLE_CLOUD_CPP_NON_US_TEST_REGION)
set_tests_properties(speech_quickstart_non_us_regional
PROPERTIES LABELS "integration-test;quickstart")

endif ()
Loading