Skip to content

[release/1.7] Remove temporary replace#8997

Merged
dmcgowan merged 1 commit intocontainerd:release/1.7from
jsturtevant:cherry-pick-8990-on-1.7
Aug 22, 2023
Merged

[release/1.7] Remove temporary replace#8997
dmcgowan merged 1 commit intocontainerd:release/1.7from
jsturtevant:cherry-pick-8990-on-1.7

Conversation

@jsturtevant
Copy link
Copy Markdown
Contributor

@jsturtevant jsturtevant commented Aug 22, 2023

Cherry-pick of #8990 onto 1.7 - 8399a4e

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Aug 22, 2023

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.

Details

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
Copy Markdown
Member

dcantah commented Aug 22, 2023

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

@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Aug 22, 2023

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 <[email protected]>
(cherry picked from commit 8399a4e)
Signed-off-by: James Sturtevant <[email protected]>
@jsturtevant jsturtevant force-pushed the cherry-pick-8990-on-1.7 branch from e942660 to 1c2dd51 Compare August 22, 2023 20:06
@jsturtevant
Copy link
Copy Markdown
Contributor Author

jsturtevant commented Aug 22, 2023

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
Copy Markdown
Member

samuelkarp commented Aug 22, 2023

/ok-to-test

@jsturtevant
Copy link
Copy Markdown
Contributor Author

jsturtevant commented Aug 22, 2023

/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
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
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jsturtevant @k8s-ci-robot @dcantah @samuelkarp @dmcgowan @estesp