refactor: migrate multi_platform_linux_test.go to nerdtest.Setup by ogulcanaydogan · Pull Request #4897 · containerd/nerdctl

ogulcanaydogan · 2026-05-14T07:21:08Z

Part of #4613.

Migrates cmd/nerdctl/container/multi_platform_linux_test.go from testutil.NewBase to the Tigron nerdtest.Setup framework, following the pattern established in #4641.

Changes:

testutil.RequireExecPlatform replaced with a custom requireMultiPlatformExec requirement backed by platformutil.CanExecProbably
testregistry.NewWithNoAuth replaced with nerdtest.RegistryWithNoAuth
Dockerfiles and compose files written via data.Temp().Save()
TestMultiPlatformRun converted to use SubTests for per-platform isolation
testMultiPlatformRun helper updated to use test.Helpers
Builder cache prune registered in Cleanup callbacks
testutil.DockerIncompatible replaced with require.Not(nerdtest.Docker)
testutil.RequiresBuild replaced with nerdtest.Build

sathiraumesh · 2026-05-15T10:50:46Z

+		return helpers.Command("push", "--platform=amd64,arm64,linux/arm/v7", imageName)
+	}
+
+	testCase.Expected = test.Expects(0, nil, nil)


use exit code conatnts from Tigron framework and there are others as well

sathiraumesh · 2026-05-15T10:51:50Z

+	var reg *registry.Server
+
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		reg = nerdtest.RegistryWithNoAuth(data, helpers, 0, false)


better to explain or use a variable for 0 constant for readbility

ogulcanaydogan · 2026-05-15T11:09:31Z

Thanks for the review. Replaced all hardcoded exit code literals in test.Expects() calls with expect.ExitCodeSuccess.

ogulcanaydogan · 2026-05-15T13:31:37Z

Addressed. Added /* random port */ inline comment on all three RegistryWithNoAuth(data, helpers, 0, false) call sites.

AkihiroSuda · 2026-05-29T15:42:36Z

test / in-host / docker is failing

2026-05-27T10:54:50.0120633Z === �[31mFAIL�[0m: cmd/nerdctl/container TestMultiPlatformRun (0.53s)
2026-05-27T10:54:50.0120788Z     multi_platform_linux_test.go:96: 
2026-05-27T10:54:50.0121047Z         ⤵️️ "TestMultiPlatformRun": into subtests prep
2026-05-27T10:54:50.0121194Z     multi_platform_linux_test.go:96: 
2026-05-27T10:54:50.0121475Z         ↩️️ "TestMultiPlatformRun": done with subtests prep

https://github.com/containerd/nerdctl/actions/runs/25974269421/job/78060013893?pr=4897

ogulcanaydogan · 2026-05-29T21:14:27Z

@AkihiroSuda thanks for the catch. Root cause was Tigron's SubTests path calling subT.Parallel() (mod/tigron/test/case.go:184), which made the docker driver run the three platform invocations concurrently and step on each other.

Pushed e10045d: dropped the SubTests map and run assertMultiPlatformRun sequentially from the Setup callback (same pattern for all five testcases in the file). On the new run, in-host / docker < linux skips TestMultiPlatformRun cleanly at the requireMultiPlatformExec gate (binfmt not present in that runner). The three remaining failures in that job (TestImagesFilterDangling, TestRunSeccompCapSysPtrace) don't touch this file.

AkihiroSuda · 2026-06-07T18:59:05Z

Still constantly failing
https://github.com/containerd/nerdctl/actions/runs/26648647792/job/79975450166?pr=4897

2026-06-07T16:57:51.9115454Z === Failing tests ===
2026-06-07T16:57:51.9115946Z TestImagesFilterDangling
2026-06-07T16:57:51.9116439Z TestImagesFilterDangling/not_dangling
2026-06-07T16:57:51.9116936Z TestRunSeccompCapSysPtrace

Can you try rebasing?

Replace testutil.NewBase with nerdtest.Setup throughout multi_platform_linux_test.go, following the Tigron framework pattern (containerd#4641). Changes: - Use nerdtest.RegistryWithNoAuth instead of testregistry.NewWithNoAuth - Use data.Temp().Save() for Dockerfiles and compose files - Convert testMultiPlatformRun helper to use test.Helpers - Use SubTests in TestMultiPlatformRun for per-platform isolation - Register builder cache cleanup in Cleanup callbacks - Add requireMultiPlatformExec requirement using platformutil Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

nerdtest.RegistryWithNoAuth returns a Server struct with Setup/Cleanup closures but does not start the registry container automatically. Add reg.Setup(data, helpers) in each test's Setup callback to start the registry before pushing, and reg.Cleanup(data, helpers) in the Cleanup callback to remove the container after the test. Affected: TestMultiPlatformBuildPush, TestMultiPlatformBuildPushNoRun, TestMultiPlatformPullPushAllPlatforms. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

…m tests Replace hardcoded 0 literals passed to test.Expects() with expect.ExitCodeSuccess for consistency with the rest of the test suite. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

The third argument 0 means "let the OS pick any available port". Add an inline comment to make this clear at the call sites. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

SubTests run via t.Parallel() in Tigron, which caused concurrent docker runs across platforms to fail in the in-host/docker CI job. The original test iterated platforms sequentially; use the existing assertMultiPlatformRun helper inside Setup to preserve that behavior. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

ogulcanaydogan · 2026-06-07T22:20:40Z

@AkihiroSuda rebased onto latest main. The docker < linux job you linked is green now, so TestImagesFilterDangling and TestRunSeccompCapSysPtrace pass - they were failing on the old base, not from this PR (the diff is a single file, multi_platform_linux_test.go).

The 5 red checks are all in other jobs hitting unrelated tests: almalinux-8 rootless and FreeBSD / 14 are the labeled flakes (#3988), rootful canary is TestIPFSAddrWithKubo (IPFS daemon), rootful old-ubuntu is TestUpdateRestartPolicy, and gomodjail failed at the "register QEMU (binfmt)" setup step. None of them touch the file this PR changes.

AkihiroSuda · 2026-06-08T06:01:35Z

+	testCase := nerdtest.Setup()
+
+	testCase.Require = require.All(
+		require.Not(nerdtest.Docker),


Please keep the comment line to explain the reason

AkihiroSuda · 2026-06-08T06:01:44Z

+	testCase := nerdtest.Setup()
+
+	testCase.Require = require.All(
+		require.Not(nerdtest.Docker),


Please keep the comment line to explain the reason

ogulcanaydogan mentioned this pull request May 14, 2026

Rewrite tests using testutil.NewBase to use nerdtest.Setup (Tigron) #4613

Open

46 tasks

ogulcanaydogan force-pushed the refactor/nerdctl-tigron-multi-platform-test branch from 8e7b2bf to 3fed4ad Compare May 14, 2026 09:51

ogulcanaydogan mentioned this pull request May 14, 2026

refactor: migrate container_run_log_driver_syslog_test.go to nerdtest.Setup #4898

Merged

sathiraumesh suggested changes May 15, 2026

View reviewed changes

ogulcanaydogan added 6 commits June 7, 2026 22:21

refactor: use tigron expect constants for exit codes in multi-platfor…

ffa6d1b

…m tests Replace hardcoded 0 literals passed to test.Expects() with expect.ExitCodeSuccess for consistency with the rest of the test suite. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

refactor: clarify zero-port argument in RegistryWithNoAuth calls

f4ca367

The third argument 0 means "let the OS pick any available port". Add an inline comment to make this clear at the call sites. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

refactor: use named constants for port and exit code in tests

9df3457

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

ogulcanaydogan force-pushed the refactor/nerdctl-tigron-multi-platform-test branch from e10045d to 5ee828b Compare June 7, 2026 21:22

AkihiroSuda added this to the v2.3.2 milestone Jun 8, 2026

AkihiroSuda reviewed Jun 8, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: migrate multi_platform_linux_test.go to nerdtest.Setup#4897

refactor: migrate multi_platform_linux_test.go to nerdtest.Setup#4897
ogulcanaydogan wants to merge 6 commits into
containerd:mainfrom
ogulcanaydogan:refactor/nerdctl-tigron-multi-platform-test

ogulcanaydogan commented May 14, 2026

Uh oh!

sathiraumesh May 15, 2026

Uh oh!

sathiraumesh May 15, 2026

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

AkihiroSuda commented May 29, 2026

Uh oh!

ogulcanaydogan commented May 29, 2026

Uh oh!

AkihiroSuda commented Jun 7, 2026

Uh oh!

ogulcanaydogan commented Jun 7, 2026

Uh oh!

AkihiroSuda Jun 8, 2026

Uh oh!

AkihiroSuda Jun 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ogulcanaydogan commented May 14, 2026

Uh oh!

sathiraumesh May 15, 2026

Choose a reason for hiding this comment

Uh oh!

sathiraumesh May 15, 2026

Choose a reason for hiding this comment

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

AkihiroSuda commented May 29, 2026

Uh oh!

ogulcanaydogan commented May 29, 2026

Uh oh!

AkihiroSuda commented Jun 7, 2026

Uh oh!

ogulcanaydogan commented Jun 7, 2026

Uh oh!

AkihiroSuda Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants