buildscripts: simplify PSM interop Kokoro buildscripts (v1.57.x backport) #11165
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #11121 to v1.57.x.
Integrates the new features of the the Kokoro PSM Interop install library introduced in grpc/psm-interop#73.
Nearly all common functionality was moved from per-language/per-branch PSM Interop build scripts to psm_interop_kokoro_lib.sh:
run_test
methodsbuild_docker_images_if_needed
methodsbuild_test_app_docker_images
methods (simple docker build + docker push + docker tag). grpc-java is one exception, as it doesn't run docker directly, but a cloudbuild flow.Now all PSM Interop jobs share the same buildscripts by all test suites:
psm-interop-test-{language}.sh
(configured asbuild_file
in the build cfg)psm-interop-build-{language}.sh
(conventional name called frompsm_interop_kokoro_lib.sh
)psm-interop-test-{language}.sh
:GRPC_LANGUAGE
,BUILD_SCRIPT_DIR
environment variables.psm_interop_kokoro_lib.sh
from the main branch of the psm-interop repo.psm-interop-build-{language}.sh
psm::run "${PSM_TEST_SUITE}"
(PSM_TEST_SUITE
configured in the cfg file).psm-interop-build-{language}.sh
:psm::lang::build_docker_images
which is called frompsm_interop_kokoro_lib.sh
.psm::build::docker_images_generic
for generic Docker build, tag, push, or provide implement its own build/publish method.References: