Skip to content

[Backport][v1.41.x] Source k8s test driver install script from core repo (#8573) #8602

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
temawi merged 1 commit into from
Oct 14, 2021
Merged

[Backport][v1.41.x] Source k8s test driver install script from core repo (#8573) #8602

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
347 changes: 0 additions & 347 deletions buildscripts/kokoro/xds-k8s-install-test-driver.sh
View file
Open in desktop

This file was deleted.

13 changes: 8 additions & 5 deletions buildscripts/kokoro/xds-k8s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ set -eo pipefail

# Constants
readonly GITHUB_REPOSITORY_NAME="grpc-java"
# GKE Cluster
readonly GKE_CLUSTER_NAME="interop-test-psm-sec-v2-us-central1-a"
readonly GKE_CLUSTER_ZONE="us-central1-a"
readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
## xDS test server/client Docker images
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server"
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"
Expand Down Expand Up @@ -152,8 +150,13 @@ run_test() {
main() {
local script_dir
script_dir="$(dirname "$0")"
# shellcheck source=buildscripts/kokoro/xds-k8s-install-test-driver.sh
source "${script_dir}/xds-k8s-install-test-driver.sh"

# Source the test driver from the master branch.
echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}"
source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")"

activate_gke_cluster GKE_CLUSTER_PSM_SECURITY

set -x
if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then
kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}"
Expand Down
Loading