Skip to content

Commit 394015b

Browse files
authored
Merge pull request containerd#3456 from Shubhranshu153/fix-test-shareable
remove is shareable test
2 parents 065eb60 + b4f002c commit 394015b

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

cmd/nerdctl/builder/builder_build_test.go

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import (
2525

2626
"gotest.tools/v3/assert"
2727

28-
"github.com/containerd/platforms"
29-
3028
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
3129
"github.com/containerd/nerdctl/v2/pkg/testutil"
3230
)
@@ -56,34 +54,6 @@ CMD ["echo", "nerdctl-build-test-string"]
5654
base.Cmd("run", "--rm", ignoredImageNamed).AssertFail()
5755
}
5856

59-
func TestBuildIsShareableForCompatiblePlatform(t *testing.T) {
60-
testutil.RequiresBuild(t)
61-
testutil.RegisterBuildCacheCleanup(t)
62-
base := testutil.NewBase(t)
63-
imageName := testutil.Identifier(t)
64-
defer base.Cmd("rmi", imageName).Run()
65-
66-
dockerfile := fmt.Sprintf(`FROM %s
67-
CMD ["echo", "nerdctl-build-test-string"]
68-
`, testutil.CommonImage)
69-
70-
buildCtx := helpers.CreateBuildContext(t, dockerfile)
71-
72-
base.Cmd("build", buildCtx, "-t", imageName).AssertErrNotContains("tarball")
73-
74-
d := platforms.DefaultSpec()
75-
platformConfig := fmt.Sprintf("%s/%s", d.OS, d.Architecture)
76-
base.Cmd("build", buildCtx, "-t", imageName, "--platform", platformConfig).AssertOK()
77-
base.Cmd("build", buildCtx, "-t", imageName, "--platform", platformConfig, "--progress", "plain").AssertErrNotContains("tarball")
78-
79-
n := platforms.Platform{OS: "linux", Architecture: "arm", Variant: ""}
80-
if n.OS != d.OS && n.Architecture != d.Architecture {
81-
notCompatiblePlatformConfig := fmt.Sprintf("%s/%s", n.OS, n.Architecture)
82-
base.Cmd("build", buildCtx, "-t", imageName, "--platform", notCompatiblePlatformConfig).AssertOK()
83-
base.Cmd("build", buildCtx, "-t", imageName, "--platform", notCompatiblePlatformConfig, "--progress", "plain").AssertErrContains("tarball")
84-
}
85-
}
86-
8757
// TestBuildBaseImage tests if an image can be built on the previously built image.
8858
// This isn't currently supported by nerdctl with BuildKit OCI worker.
8959
func TestBuildBaseImage(t *testing.T) {

0 commit comments

Comments
 (0)