Skip to content

interop-test: Opt-in GKE tests && Remove duplicated GCE tests (v1.45.x backport) #9210

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
ejona86 merged 3 commits into from
May 27, 2022
Merged

interop-test: Opt-in GKE tests && Remove duplicated GCE tests (v1.45.x backport) #9210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b6a8c7
Add more xds_lb test cases (#8998)
lidizheng Mar 21, 2022
086391c
Redirect xDS tests to use grpc/grpc's master branch (#8982)
lidizheng Mar 17, 2022
0fac611
interop-test: Remove duplicated GCE tests
lidizheng May 24, 2022
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
10 changes: 2 additions & 8 deletions buildscripts/kokoro/xds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,10 @@ fi
cd github

pushd grpc-java/interop-testing
branch=$(git branch --all --no-color --contains "${KOKORO_GITHUB_COMMIT}" \
| grep -v HEAD | head -1)
shopt -s extglob
branch="${branch//[[:space:]]}"
branch="${branch##remotes/origin/}"
shopt -u extglob
../gradlew installDist -x test -PskipCodegen=true -PskipAndroid=true
popd

git clone -b "${branch}" --single-branch --depth=1 https://github.com/grpc/grpc.git
git clone -b master --single-branch --depth=1 https://github.com/grpc/grpc.git

grpc/tools/run_tests/helper_scripts/prep_xds.sh

Expand All @@ -28,7 +22,7 @@ grpc/tools/run_tests/helper_scripts/prep_xds.sh
# --test_case after they are added into "all".
JAVA_OPTS=-Djava.util.logging.config.file=grpc-java/buildscripts/xds_logging.properties \
python3 grpc/tools/run_tests/run_xds_tests.py \
--test_case="all,circuit_breaking,timeout,fault_injection,csds" \
--test_case="ping_pong,circuit_breaking" \
--project_id=grpc-testing \
--project_num=830293263384 \
--source_image=projects/grpc-testing/global/images/xds-test-server-5 \
Expand Down
10 changes: 9 additions & 1 deletion buildscripts/kokoro/xds_k8s_lb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,15 @@ main() {
build_docker_images_if_needed
# Run tests
cd "${TEST_DRIVER_FULL_DIR}"
run_test api_listener_test
local failed_tests=0
test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test")
for test in "${test_suites[@]}"; do
run_test $test || (( failed_tests++ ))
done
echo "Failed test suites: ${failed_tests}"
if (( failed_tests > 0 )); then
exit 1
fi
}

main "$@"