Skip to content

[Backport][v1.37.x] xds-k8s tests: Use test driver from master branch#27681

Merged
srini100 merged 2 commits intogrpc:v1.37.xfrom
temawi:v1.37.x-xds-k8s-install-from-master
Oct 13, 2021
Merged

[Backport][v1.37.x] xds-k8s tests: Use test driver from master branch#27681
srini100 merged 2 commits intogrpc:v1.37.xfrom
temawi:v1.37.x-xds-k8s-install-from-master

Conversation

@temawi
Copy link
Copy Markdown
Contributor

@temawi temawi commented Oct 11, 2021

Backports sourcing the test driver install script from master.

This is a backport of #27389 and #27462

@sergiitk

Copy link
Copy Markdown
Member

@sergiitk sergiitk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I understand, we should delete tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh now. Since it's not a backport, I think we should just make add a commit. This commit can be cherry-picked to other branches in further PRs.

Copy link
Copy Markdown
Member

@sergiitk sergiitk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed IRL. Deleting the shared file makes little sense. When new versions are cut, this file will be present in them anyway.

@sergiitk sergiitk added release notes: no Indicates if PR should not be in release notes area/test kokoro:force-run labels Oct 11, 2021
@sergiitk sergiitk changed the title V1.37.x xds k8s install from master [Backport][v1.37.x] xds-k8s tests: Use test driver from master branch Oct 12, 2021
These were missed when  creating the Python virtual env.
Instead of directly sourcing the test driver provisioning script from the same branch, the script is downloaded (with curl) and sourced from the master branch.

This allows changes made to the test driver to be reflected in all future release branches. A separate PR will backport this change to existing release branches.

All cluster definitions are also moved to the install script, allowing any cluster changes to be done in one place in the master branch.
@temawi temawi force-pushed the v1.37.x-xds-k8s-install-from-master branch from f9c68d1 to 0802585 Compare October 13, 2021 16:49
Copy link
Copy Markdown
Member

@sergiitk sergiitk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sanity Checks passed - this can be merged now. Thank you so much for getting this right!

@temawi
Copy link
Copy Markdown
Contributor Author

temawi commented Oct 13, 2021

@sergiitk I don't have permission to merge, can you kick that off please?

@sergiitk
Copy link
Copy Markdown
Member

Neither do I - all but a few recent branches are protected. I'll forward this to @srini100.

@srini100 srini100 merged commit 64ab58c into grpc:v1.37.x Oct 13, 2021
@temawi temawi deleted the v1.37.x-xds-k8s-install-from-master branch October 13, 2021 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/test release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants