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.

Sign up for GitHub

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

Jump to bottom

[release/1.7] Remove temporary replace #8997

Merged
merged 1 commit into from
Aug 22, 2023
Merged

[release/1.7] Remove temporary replace #8997

merged 1 commit into from
Aug 22, 2023

Conversation

jsturtevant
Copy link
Contributor

Cherry-pick of #8990 onto 1.7 - 8399a4e

@k8s-ci-robot
Copy link

Hi @jsturtevant. Thanks for your PR.

I'm waiting for a containerd 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.

@dcantah
Copy link
Member

dcantah commented Aug 22, 2023

Restarted CI, looked like a fail to pull an image.

@samuelkarp
Copy link
Member

Mind using git cherry-pick -xs to retain the digest of the original commit?

https://github.com/containerd/containerd/blob/main/RELEASES.md#backporting

@jsturtevant
Remove temporary replace
1c2dd51 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
(cherry picked from commit 8399a4e)
Signed-off-by: James Sturtevant <jstur@microsoft.com>
@jsturtevant
Copy link
Contributor Author

Mind using git cherry-pick -xs to retain the digest of the original commit?

https://github.com/containerd/containerd/blob/main/RELEASES.md#backporting

updated, thanks for the pointer!

@samuelkarp
Copy link
Member

/ok-to-test

@jsturtevant
Copy link
Contributor Author

/test pull-containerd-node-e2e-1-7
looks like a flake not related to this change

@dmcgowan dmcgowan merged commit b2553c3 into containerd:release/1.7 Aug 22, 2023
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@estesp estesp estesp approved these changes

Assignees
No one assigned
Labels
ok-to-test
Projects
Pull Request Review
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jsturtevant @k8s-ci-robot @dcantah @samuelkarp @dmcgowan @estesp