PSM Interop: simplify Kokoro buildscripts #2729
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Using grpc/psm-interop#73 / grpc/psm-interop@1c0f169: upd: failed |
|
Using grpc/psm-interop#73 / grpc/psm-interop@5aeb13f: Full LB test run. |
gnossen
approved these changes
Apr 30, 2024
sergiitk
added a commit
to grpc/psm-interop
that referenced
this pull request
May 1, 2024
#73) Major rework of the shared Kokoro PSM Interop install library. Nearly all common functionality was moved from per-language/per-branch PSM Interop build scripts to psm_interop_kokoro_lib.sh: 1. The list of tests in the each test suite 2. Per-test-suite flag customization 3. `run_test` methods 4. `build_docker_images_if_needed` methods 5. Generic `build_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. Added new options to control PSM interop test driver execution via environment variables: ```sh # Overrides the list of test to run. A whitespace-separated string. Example: # PSM_TESTS="app_net_test baseline_test" readonly PSM_TESTS="${PSM_TESTS:-}" # A space-separated string with extra flags to append to the test driver arguments. # Can be used to execute a run and test a new flag value, f.e.: # PSM_EXTRA_FLAGS="--noenable_workload_identity --td_bootstrap_image=us-docker.pkg.dev/new-image..." # In addition, can be used to run a single test in a suite. # F.e. to run only test_mtls in security_test: # PSM_TESTS="security_test" PSM_EXTRA_FLAGS="SecurityTest.test_mtls" readonly PSM_EXTRA_FLAGS="${PSM_EXTRA_FLAGS:-}" ``` Improved logging: 1. Buildscript test logs are now prepended with the date: - when a shell command passed to `psm::tools::run_verbose` - `psm::tools::log` is used in place of `echo` 2. Individual install and build steps partially or fully redirected to the dedicated log files: - `install-apt.log` - `install-pip.log` - `build-docker.log` 3. Various other log improvements: printing tests in the suite, printing flags passed to the frameworks, etc Corresponding per-language buildscript PRs: 1. java - grpc/grpc-java#11121 2. cpp - grpc/grpc#36450 3. go - grpc/grpc-go#7171 4. node - grpc/grpc-node#2729 Notes for the reviewer: 1. The new script is backward-compatible with the old-style buildscripts. 2. Per-language buildscript PRs will be backported to all supported branches, and this should be the very last backport chore we'll ever need. 3. A minor change to the subsetting test was needed to solve [a one-off exception](https://github.com/grpc/grpc/blob/6e981d7460af561230d455c3623774e76e18cbfe/tools/internal_ci/linux/grpc_xds_k8s_lb.sh#L123-L127) from the normal `run_test` flow. ref b/288578634
|
The last check using the install script from |
sergiitk
changed the title
|
Please merge it yet. I'd like to wait until I got approvals on the same change from the rest of the repos. So we don't have to do another set of backports if anything comes up. |
sergiitk
force-pushed
the
psm-interop-common-prod-tests
branch
from
6d6e535 to
1495b02
Compare
|
Just to stay on the safe side, ad-hoc run after squashing all commits and rebasing against master: |
sergiitk
pushed a commit
to sergiitk/grpc-node
that referenced
this pull request
May 6, 2024
PSM Interop: simplify Kokoro buildscripts
sergiitk
pushed a commit
to sergiitk/grpc-node
that referenced
this pull request
May 6, 2024
PSM Interop: simplify Kokoro buildscripts
sergiitk
pushed a commit
to sergiitk/grpc-node
that referenced
this pull request
May 6, 2024
PSM Interop: simplify Kokoro buildscripts
sergiitk
pushed a commit
to sergiitk/grpc-node
that referenced
this pull request
May 6, 2024
PSM Interop: simplify Kokoro buildscripts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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_testmethodsbuild_docker_images_if_neededmethodsbuild_test_app_docker_imagesmethods (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_filein 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_DIRenvironment variables.psm_interop_kokoro_lib.shfrom the main branch of the psm-interop repo.psm-interop-build-{language}.shpsm::run "${PSM_TEST_SUITE}"(PSM_TEST_SUITEconfigured in the cfg file).psm-interop-build-{language}.sh:psm::lang::build_docker_imageswhich is called frompsm_interop_kokoro_lib.sh.psm::build::docker_images_genericfor generic Docker build, tag, push, or provide implement its own build/publish method.References: