Skip to content

Commit 0006c69

Browse files
authored
Source k8s test driver install script from core repo (#8573) (#8602)
The test driver install script is read directly from the core repo master branch and the copy in the Java repo is deleted.
1 parent 1ac46cf commit 0006c69

File tree

3 files changed

+16
-357
lines changed

3 files changed

+16
-357
lines changed

buildscripts/kokoro/xds-k8s-install-test-driver.sh

Lines changed: 0 additions & 347 deletions
This file was deleted.

buildscripts/kokoro/xds-k8s.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ set -eo pipefail
33

44
# Constants
55
readonly GITHUB_REPOSITORY_NAME="grpc-java"
6-
# GKE Cluster
7-
readonly GKE_CLUSTER_NAME="interop-test-psm-sec-v2-us-central1-a"
8-
readonly GKE_CLUSTER_ZONE="us-central1-a"
6+
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"
97
## xDS test server/client Docker images
108
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server"
119
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"
@@ -152,8 +150,13 @@ run_test() {
152150
main() {
153151
local script_dir
154152
script_dir="$(dirname "$0")"
155-
# shellcheck source=buildscripts/kokoro/xds-k8s-install-test-driver.sh
156-
source "${script_dir}/xds-k8s-install-test-driver.sh"
153+
154+
# Source the test driver from the master branch.
155+
echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}"
156+
source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")"
157+
158+
activate_gke_cluster GKE_CLUSTER_PSM_SECURITY
159+
157160
set -x
158161
if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then
159162
kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}"

0 commit comments

Comments
 (0)