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.5] feat: support import image for specific platform #7595

Merged
merged 2 commits into from
Nov 2, 2022
Merged

[release/1.5] feat: support import image for specific platform #7595

merged 2 commits into from
Nov 2, 2022

Conversation

ginglis13
Copy link
Contributor

@ginglis13 ginglis13 commented Oct 27, 2022 •
edited
Loading

Included both commits from PR #6070

fix: wrong flag type

Signed-off-by: jonyhy yun.hao@daocloud.io
(cherry picked from commit 933ddaa)
Signed-off-by: Gavin Inglis giinglis@amazon.com

feat: support import image for specific platform

Signed-off-by: jonyhy yun.hao@daocloud.io
(cherry picked from commit da16d49)
Signed-off-by: Gavin Inglis giinglis@amazon.com

@k8s-ci-robot
Copy link

Hi @ginglis13. 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.

@jonyhy96 @ginglis13
feat: support import image for specific platform
71549ee 
Signed-off-by: jonyhy <yun.hao@daocloud.io>
(cherry picked from commit da16d49)
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
@ginglis13 ginglis13 force-pushed the cherry-pick-6070-add-withimportplatform-release1.5 branch from d41a3fe to 71549ee Compare October 27, 2022 21:00
@dmcgowan dmcgowan added this to Merge on Green in Code Review Oct 27, 2022
@dmcgowan dmcgowan moved this from Merge on Green to Ready For Review in Code Review Oct 27, 2022
@dcantah
Copy link
Member

dcantah commented Oct 28, 2022

@ginglis13 Could you take a look at the CI fails when you get a chance? Definitely looks related:

=== RUN   TestImageLoad
[349](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:350)
    image_load_test.go:42: docker save image into tarball
[350](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:351)
    image_load_test.go:54: make sure no such image in cri
[351](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:352)
    image_load_test.go:61: load image in cri
[352](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:353)
    image_load_test.go:66: 
[353](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:354)
        	Error Trace:	image_load_test.go:66
[354](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:355)
        	Error:      	Received unexpected error:
[355](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:356)
        	            	exit status 1
[356](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:357)
        	Test:       	TestImageLoad
[357](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:358)
        	Messages:   	output: "ctr: \"false\": unknown operating system or architecture: invalid argument\n"
[358](https://github.com/containerd/containerd/actions/runs/3340859419/jobs/5547518266#step:13:359)
--- FAIL: TestImageLoad (0.54s)

@jonyhy96 @ginglis13
fix: wrong flag type
a4a21c6 
Signed-off-by: jonyhy <yun.hao@daocloud.io>
(cherry picked from commit 933ddaa)
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
@ginglis13
Copy link
Contributor Author

Could you take a look at the CI fails when you get a chance? Definitely looks related

@dcantah Yup it certainly is... looks like I cherry-picked the first commit of #6070, missed that there were 2 commits, the second of which (933ddaa) address this exact issue.

What's the SOP here? cherry-pick both commits from the original PR and include them here?

@dcantah
Copy link
Member

dcantah commented Oct 28, 2022

Yep! Cherry-pick both same as you did with the first here (same -x -s so you can get your signed off by included and what commit it was cp'ed from). Maybe in the PR description link to the original PR as well

dcantah
dcantah approved these changes Oct 28, 2022
View reviewed changes
Copy link
Member

@dcantah dcantah left a comment

Choose a reason for hiding this comment

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

LGTM on green

estesp
estesp approved these changes Nov 1, 2022
View reviewed changes
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit d0350eb into containerd:release/1.5 Nov 2, 2022
Code Review automation moved this from Ready For Review to Done Nov 2, 2022
@dmcgowan dmcgowan mentioned this pull request Dec 6, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estesp estesp estesp approved these changes

@dcantah dcantah dcantah approved these changes

Assignees
No one assigned
Labels
needs-ok-to-test
Projects
Code Review
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ginglis13 @k8s-ci-robot @dcantah @estesp @jonyhy96