Skip to content

Commit

Permalink
Merge pull request containerd#3456 from Shubhranshu153/fix-test-share…
Browse files Browse the repository at this point in the history
…able

remove is shareable test
  • Loading branch information
AkihiroSuda authored Oct 5, 2024
2 parents 065eb60 + b4f002c commit 394015b
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions cmd/nerdctl/builder/builder_build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (

"gotest.tools/v3/assert"

"github.com/containerd/platforms"

"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
"github.com/containerd/nerdctl/v2/pkg/testutil"
)
Expand Down Expand Up @@ -56,34 +54,6 @@ CMD ["echo", "nerdctl-build-test-string"]
base.Cmd("run", "--rm", ignoredImageNamed).AssertFail()
}

func TestBuildIsShareableForCompatiblePlatform(t *testing.T) {
testutil.RequiresBuild(t)
testutil.RegisterBuildCacheCleanup(t)
base := testutil.NewBase(t)
imageName := testutil.Identifier(t)
defer base.Cmd("rmi", imageName).Run()

dockerfile := fmt.Sprintf(`FROM %s
CMD ["echo", "nerdctl-build-test-string"]
`, testutil.CommonImage)

buildCtx := helpers.CreateBuildContext(t, dockerfile)

base.Cmd("build", buildCtx, "-t", imageName).AssertErrNotContains("tarball")

d := platforms.DefaultSpec()
platformConfig := fmt.Sprintf("%s/%s", d.OS, d.Architecture)
base.Cmd("build", buildCtx, "-t", imageName, "--platform", platformConfig).AssertOK()
base.Cmd("build", buildCtx, "-t", imageName, "--platform", platformConfig, "--progress", "plain").AssertErrNotContains("tarball")

n := platforms.Platform{OS: "linux", Architecture: "arm", Variant: ""}
if n.OS != d.OS && n.Architecture != d.Architecture {
notCompatiblePlatformConfig := fmt.Sprintf("%s/%s", n.OS, n.Architecture)
base.Cmd("build", buildCtx, "-t", imageName, "--platform", notCompatiblePlatformConfig).AssertOK()
base.Cmd("build", buildCtx, "-t", imageName, "--platform", notCompatiblePlatformConfig, "--progress", "plain").AssertErrContains("tarball")
}
}

// TestBuildBaseImage tests if an image can be built on the previously built image.
// This isn't currently supported by nerdctl with BuildKit OCI worker.
func TestBuildBaseImage(t *testing.T) {
Expand Down

0 comments on commit 394015b

Please sign in to comment.