[Python PSM-CSM Interop] Add config file for psm-csm-python (#35644)
Tested by trigger `grpc/core/master/linux/psm-csm-python` job manually:
- [x] [grpc/core/master/linux/psm-csm-python](https://source.cloud.google.com/results/invocations/31cb5a6e-ed44-4dd7-a383-14bf0a5907b0)
<!--
If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.
If your pull request is for a specific language, please add the appropriate
lang label.
-->
Closes #35644
COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35644 from XuanWang-Amos:xds_add_psm_csm_python_test e2d1a62052
PiperOrigin-RevId: 602827145
pull/35585/head
parent
1465313684
commit
466115a9bc
2 changed files with 214 additions and 0 deletions
@ -0,0 +1,26 @@ |
|||||||
|
# Copyright 2024 gRPC authors. |
||||||
|
# |
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
# you may not use this file except in compliance with the License. |
||||||
|
# You may obtain a copy of the License at |
||||||
|
# |
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
# |
||||||
|
# Unless required by applicable law or agreed to in writing, software |
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
# See the License for the specific language governing permissions and |
||||||
|
# limitations under the License. |
||||||
|
|
||||||
|
# Config file for the internal CI (in protobuf text format) |
||||||
|
|
||||||
|
# Location of the continuous shell script in repository. |
||||||
|
build_file: "grpc/tools/internal_ci/linux/psm-csm-python.sh" |
||||||
|
timeout_mins: 240 |
||||||
|
action { |
||||||
|
define_artifacts { |
||||||
|
regex: "artifacts/**/*sponge_log.xml" |
||||||
|
regex: "artifacts/**/*.log" |
||||||
|
strip_prefix: "artifacts" |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,188 @@ |
|||||||
|
#!/usr/bin/env bash |
||||||
|
# Copyright 2024 gRPC authors. |
||||||
|
# |
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
# you may not use this file except in compliance with the License. |
||||||
|
# You may obtain a copy of the License at |
||||||
|
# |
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
# |
||||||
|
# Unless required by applicable law or agreed to in writing, software |
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
# See the License for the specific language governing permissions and |
||||||
|
# limitations under the License. |
||||||
|
|
||||||
|
set -eo pipefail |
||||||
|
|
||||||
|
# Constants |
||||||
|
readonly GITHUB_REPOSITORY_NAME="grpc" |
||||||
|
readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" |
||||||
|
## xDS test server/client Docker images |
||||||
|
## We're only testing Python client for now |
||||||
|
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-server" |
||||||
|
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-client" |
||||||
|
readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" |
||||||
|
readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing" |
||||||
|
|
||||||
|
####################################### |
||||||
|
# Builds test app Docker images and pushes them to GCR |
||||||
|
# Globals: |
||||||
|
# BUILD_APP_PATH |
||||||
|
# SERVER_IMAGE_NAME: Test server Docker image name |
||||||
|
# CLIENT_IMAGE_NAME: Test client Docker image name |
||||||
|
# GIT_COMMIT: SHA-1 of git commit being built |
||||||
|
# TESTING_VERSION: version branch under test, f.e. v1.42.x, master |
||||||
|
# Arguments: |
||||||
|
# None |
||||||
|
# Outputs: |
||||||
|
# Writes the output of `gcloud builds submit` to stdout, stderr |
||||||
|
####################################### |
||||||
|
build_test_app_docker_images() { |
||||||
|
echo "Building Python xDS interop test app Docker images" |
||||||
|
|
||||||
|
pushd "${SRC_DIR}" |
||||||
|
docker build \ |
||||||
|
-f src/python/grpcio_tests/tests_py3_only/interop/Dockerfile.client \ |
||||||
|
-t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \ |
||||||
|
. |
||||||
|
|
||||||
|
docker build \ |
||||||
|
-f tools/dockerfile/interoptest/grpc_interop_cxx_xds/Dockerfile.xds_server \ |
||||||
|
-t "${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \ |
||||||
|
. |
||||||
|
|
||||||
|
popd |
||||||
|
|
||||||
|
gcloud -q auth configure-docker |
||||||
|
|
||||||
|
docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" |
||||||
|
docker push "${SERVER_IMAGE_NAME}:${GIT_COMMIT}" |
||||||
|
|
||||||
|
if is_version_branch "${TESTING_VERSION}"; then |
||||||
|
tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}" |
||||||
|
tag_and_push_docker_image "${SERVER_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}" |
||||||
|
fi |
||||||
|
} |
||||||
|
|
||||||
|
####################################### |
||||||
|
# Builds test app and its docker images unless they already exist |
||||||
|
# Globals: |
||||||
|
# SERVER_IMAGE_NAME: Test server Docker image name |
||||||
|
# CLIENT_IMAGE_NAME: Test client Docker image name |
||||||
|
# GIT_COMMIT: SHA-1 of git commit being built |
||||||
|
# FORCE_IMAGE_BUILD |
||||||
|
# Arguments: |
||||||
|
# None |
||||||
|
# Outputs: |
||||||
|
# Writes the output to stdout, stderr |
||||||
|
####################################### |
||||||
|
build_docker_images_if_needed() { |
||||||
|
# Check if images already exist |
||||||
|
server_tags="$(gcloud_gcr_list_image_tags "${SERVER_IMAGE_NAME}" "${GIT_COMMIT}")" |
||||||
|
printf "Server image: %s:%s\n" "${SERVER_IMAGE_NAME}" "${GIT_COMMIT}" |
||||||
|
echo "${server_tags:-Server image not found}" |
||||||
|
|
||||||
|
client_tags="$(gcloud_gcr_list_image_tags "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}")" |
||||||
|
printf "Client image: %s:%s\n" "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" |
||||||
|
echo "${client_tags:-Client image not found}" |
||||||
|
|
||||||
|
# Build if any of the images are missing, or FORCE_IMAGE_BUILD=1 |
||||||
|
if [[ "${FORCE_IMAGE_BUILD}" == "1" || -z "${server_tags}" || -z "${client_tags}" ]]; then |
||||||
|
build_test_app_docker_images |
||||||
|
else |
||||||
|
echo "Skipping Python test app build" |
||||||
|
fi |
||||||
|
} |
||||||
|
|
||||||
|
####################################### |
||||||
|
# Executes the test case |
||||||
|
# Globals: |
||||||
|
# TEST_DRIVER_FLAGFILE: Relative path to test driver flagfile |
||||||
|
# KUBE_CONTEXT: The name of kubectl context with GKE cluster access |
||||||
|
# TEST_XML_OUTPUT_DIR: Output directory for the test xUnit XML report |
||||||
|
# SERVER_IMAGE_NAME: Test server Docker image name |
||||||
|
# CLIENT_IMAGE_NAME: Test client Docker image name |
||||||
|
# GIT_COMMIT: SHA-1 of git commit being built |
||||||
|
# TESTING_VERSION: version branch under test: used by the framework to determine the supported PSM |
||||||
|
# features. |
||||||
|
# Arguments: |
||||||
|
# Test case name |
||||||
|
# Outputs: |
||||||
|
# Writes the output of test execution to stdout, stderr |
||||||
|
# Test xUnit report to ${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml |
||||||
|
####################################### |
||||||
|
run_test() { |
||||||
|
# Test driver usage: |
||||||
|
# https://github.com/grpc/psm-interop#basic-usage |
||||||
|
local test_name="${1:?Usage: run_test test_name}" |
||||||
|
local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}" |
||||||
|
mkdir -pv "${out_dir}" |
||||||
|
set -x |
||||||
|
python3 -m "tests.${test_name}" \ |
||||||
|
--flagfile="${TEST_DRIVER_FLAGFILE}" \ |
||||||
|
--flagfile="config/common-csm.cfg" \ |
||||||
|
--kube_context="${KUBE_CONTEXT}" \ |
||||||
|
--server_image="${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \ |
||||||
|
--client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \ |
||||||
|
--testing_version="${TESTING_VERSION}" \ |
||||||
|
--nocheck_local_certs \ |
||||||
|
--force_cleanup \ |
||||||
|
--collect_app_logs \ |
||||||
|
--log_dir="${out_dir}" \ |
||||||
|
--xml_output_file="${out_dir}/sponge_log.xml" \ |
||||||
|
|& tee "${out_dir}/sponge_log.log" |
||||||
|
set +x |
||||||
|
} |
||||||
|
|
||||||
|
####################################### |
||||||
|
# Main function: provision software necessary to execute tests, and run them |
||||||
|
# Globals: |
||||||
|
# KOKORO_ARTIFACTS_DIR |
||||||
|
# GITHUB_REPOSITORY_NAME |
||||||
|
# SRC_DIR: Populated with absolute path to the source repo |
||||||
|
# TEST_DRIVER_REPO_DIR: Populated with the path to the repo containing |
||||||
|
# the test driver |
||||||
|
# TEST_DRIVER_FULL_DIR: Populated with the path to the test driver source code |
||||||
|
# TEST_DRIVER_FLAGFILE: Populated with relative path to test driver flagfile |
||||||
|
# TEST_XML_OUTPUT_DIR: Populated with the path to test xUnit XML report |
||||||
|
# GIT_ORIGIN_URL: Populated with the origin URL of git repo used for the build |
||||||
|
# GIT_COMMIT: Populated with the SHA-1 of git commit being built |
||||||
|
# GIT_COMMIT_SHORT: Populated with the short SHA-1 of git commit being built |
||||||
|
# KUBE_CONTEXT: Populated with name of kubectl context with GKE cluster access |
||||||
|
# Arguments: |
||||||
|
# None |
||||||
|
# Outputs: |
||||||
|
# Writes the output of test execution to stdout, stderr |
||||||
|
####################################### |
||||||
|
main() { |
||||||
|
local script_dir |
||||||
|
script_dir="$(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}")" |
||||||
|
|
||||||
|
activate_gke_cluster GKE_CLUSTER_PSM_CSM |
||||||
|
|
||||||
|
if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then |
||||||
|
kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}" |
||||||
|
else |
||||||
|
local_setup_test_driver "${script_dir}" |
||||||
|
fi |
||||||
|
build_docker_images_if_needed |
||||||
|
# Run tests |
||||||
|
cd "${TEST_DRIVER_FULL_DIR}" |
||||||
|
local failed_tests=0 |
||||||
|
test_suites=( |
||||||
|
"gamma.gamma_baseline_test" |
||||||
|
"gamma.affinity_test" |
||||||
|
) |
||||||
|
for test in "${test_suites[@]}"; do |
||||||
|
run_test $test || (( ++failed_tests )) |
||||||
|
done |
||||||
|
echo "Failed test suites: ${failed_tests}" |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
main "$@" |
Loading…
Reference in new issue