diff options
| author | sanjaypujare <sanjaypujare@users.noreply.github.com> | 2023-02-15 16:59:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 16:59:18 -0800 |
| commit | 7139bb1d2ecf72c3f7f382d8db1b9d5094566938 (patch) | |
| tree | d21cfe0e4957c123972854cb80241256a1e24d79 /tools/internal_ci/linux | |
| parent | 3a94e50e78e2d934b354de1cb77aed6610b464c0 (diff) | |
| download | grpc-grpc-7139bb1d2ecf72c3f7f382d8db1b9d5094566938.tar.gz | |
xds-interop-testing: move TESTING_VERSION check to after calling kokoro_setup_test_driver func and fix script_dir (#32405)
Diffstat (limited to 'tools/internal_ci/linux')
| -rwxr-xr-x[-rw-r--r--] | tools/internal_ci/linux/grpc_xds_k8s_run_xtest.sh | 0 | ||||
| -rw-r--r-- | tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh | 13 | ||||
| -rwxr-xr-x | tools/internal_ci/linux/grpc_xds_k8s_xlang.sh | 11 |
3 files changed, 11 insertions, 13 deletions
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_run_xtest.sh b/tools/internal_ci/linux/grpc_xds_k8s_run_xtest.sh index 03dff0e755..03dff0e755 100644..100755 --- a/tools/internal_ci/linux/grpc_xds_k8s_run_xtest.sh +++ b/tools/internal_ci/linux/grpc_xds_k8s_run_xtest.sh diff --git a/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh b/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh index 59209db858..1eb6d713ed 100644 --- a/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh +++ b/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh @@ -43,30 +43,29 @@ readonly MAIN_BRANCH="${MAIN_BRANCH:-master}" ####################################### main() { local script_dir - script_dir="$(dirname "$0")" + script_dir="${PWD}/$(dirname "$0")" # 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}")" - if [ "${TESTING_VERSION}" != "master" ]; then - echo "Skipping cross lang cross branch testing for non-master branch ${TESTING_VERSION}" - exit 0 - fi - activate_gke_cluster GKE_CLUSTER_PSM_SECURITY set -x if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}" + if [ "${TESTING_VERSION}" != "master" ]; then + echo "Skipping cross branch testing for non-master branch ${TESTING_VERSION}" + exit 0 + fi cd "${TEST_DRIVER_FULL_DIR}" else local_setup_test_driver "${script_dir}" cd "${SRC_DIR}/${TEST_DRIVER_PATH}" fi - source ${script_dir}/grpc_xds_k8s_run_xtest.sh + source "${script_dir}/grpc_xds_k8s_run_xtest.sh" local failed_tests=0 local successful_string diff --git a/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh b/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh index e989baea06..4851e06616 100755 --- a/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh +++ b/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh @@ -45,22 +45,21 @@ readonly MAIN_BRANCH="${MAIN_BRANCH:-master}" ####################################### main() { local script_dir - script_dir="$(dirname "$0")" + script_dir="${PWD}/$(dirname "$0")" # 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}")" - if [ "${TESTING_VERSION}" != "master" ]; then - echo "Skipping cross lang cross branch testing for non-master branch ${TESTING_VERSION}" - exit 0 - fi - activate_gke_cluster GKE_CLUSTER_PSM_SECURITY set -x if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}" + if [ "${TESTING_VERSION}" != "master" ]; then + echo "Skipping cross lang testing for non-master branch ${TESTING_VERSION}" + exit 0 + fi cd "${TEST_DRIVER_FULL_DIR}" else local_setup_test_driver "${script_dir}" |