Skip to content

Commit

Permalink
Source k8s test driver install script from core repo (#8573)
Browse files Browse the repository at this point in the history
The test driver install script is read directly from the core repo master branch and the copy in the Java repo is deleted.
  • Loading branch information
temawi committed Oct 7, 2021
1 parent 8ac9a4e commit 83d3610
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 357 deletions.
347 changes: 0 additions & 347 deletions buildscripts/kokoro/xds-k8s-install-test-driver.sh

This file was deleted.

13 changes: 8 additions & 5 deletions buildscripts/kokoro/xds-k8s.sh
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

0 comments on commit 83d3610

Please sign in to comment.