Skip to content

[pull] main from containerd:main #241

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

Merged
pull merged 2 commits into from
Feb 16, 2026
Merged

[pull] main from containerd:main #241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafbfcb
integration: Fix TestImageLoad() failure on CI
rata Feb 16, 2026
9538c2c
Merge pull request #12903 from rata/fix-TestImageLoad
estesp Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion integration/image_load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,15 @@ func TestImageLoad(t *testing.T) {
require.NoError(t, err, "ctr should be installed, make sure you've run `make install-deps`")
// Add --local=true option since currently the transfer service
// does not provide enough progress to avoid timeout
// and --platform to only check for manifests for this platform. The "ctr image import"
// command otherwise might fail, if the the above docker commands use the containerd image
// store, as in that case `docker save` produces OCI artifacts referencing manifests for
// other platforms that are not included in what we downloaded. By specifying a platform, we
// just ignore the references to other platforms.
platform := "--platform=" + goruntime.GOOS + "/" + goruntime.GOARCH
output, err = exec.Command(ctr, "-address="+containerdEndpoint,
"-n=k8s.io", "images", "import", "--local=true", tar).CombinedOutput()
"-n=k8s.io", "images", "import", "--local=true",
platform, tar).CombinedOutput()
require.NoError(t, err, "output: %q", output)

t.Logf("make sure image is loaded")
Expand Down
Loading