Skip to content
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.

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

🌱 test: add dynamic finalizer assertions for e2e framework #9970

Merged

Conversation

adityabhatia
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # #9969

/area testing

@k8s-ci-robot k8s-ci-robot added area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 9, 2024
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 9, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @adityabhatia. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 9, 2024
@adityabhatia adityabhatia force-pushed the dynamicFinalizerAssertions branch 2 times, most recently from d61b920 to 2cf1bbc Compare January 9, 2024 14:27
@sbueringer
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 9, 2024
@sbueringer
Copy link
Member

@adityabhatia There seems to be something wrong with the commit. The diff looks correct in GitHub but based on the commit title and locally it is a merged commit.

test/e2e/quick_start_test.go Outdated Show resolved Hide resolved
test/e2e/quick_start_test.go Outdated Show resolved Hide resolved
test/framework/finalizers_helpers.go Outdated Show resolved Hide resolved
test/framework/finalizers_helpers.go Show resolved Hide resolved
@adityabhatia adityabhatia force-pushed the dynamicFinalizerAssertions branch 2 times, most recently from cee1b30 to 11d12fa Compare January 10, 2024 22:30
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Looks good.

Just two nits.

Let's hold this PR until we fixed the finalizer test on main. Just to not add another change on top of the current flake :)

test/framework/finalizers_helpers.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 11, 2024
@sbueringer
Copy link
Member

sbueringer commented Jan 12, 2024

@adityabhatia Happy to merge this PR now that we reverted the other PR that broke CI (+/- addressing nits / rebase)., to unblock the work in CAPV.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 12, 2024
@adityabhatia
Copy link
Contributor Author

adityabhatia commented Jan 12, 2024

@adityabhatia Happy to merge this PR now that we reverted the other PR that broke CI (+/- addressing nits / rebase)., to unblock the work in CAPV.

Rebased on main (post revert) and ready for review :)

@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b9346724cb943c4d5c7f77faddbc87ddcee6756f

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2024
@k8s-ci-robot k8s-ci-robot merged commit acc88b9 into kubernetes-sigs:main Jan 15, 2024
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Jan 15, 2024
@sbueringer
Copy link
Member

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

@sbueringer: #9970 failed to apply on top of branch "release-1.6":

Applying: test: add dynamic finalizer assertions for e2e framework
Using index info to reconstruct a base tree...
M	test/e2e/quick_start_test.go
M	test/framework/finalizers_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/finalizers_helpers.go
CONFLICT (content): Merge conflict in test/framework/finalizers_helpers.go
Auto-merging test/e2e/quick_start_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test: add dynamic finalizer assertions for e2e framework
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sbueringer
Copy link
Member

@adityabhatia Can you open a cherry-pick PR please?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants