Merge pull request #4180 from apostasie/fix-gomodjail-integration

[FIX]: #4012 follow-ups (fixes and target test binaries)

Author: AkihiroSuda

.github/workflows/workflow-test.yml

@@ -209,32 +209,24 @@ jobs:
             target: rootless
             runner: "ubuntu-22.04"
             arch: amd64
-            nerdctl: ""
-            comment: ""
           - ubuntu: 24.04
             containerd: v2.0.5
             rootlesskit: v2.3.4
             target: rootless
             arch: amd64
             runner: "ubuntu-24.04"
-            nerdctl: ""
-            comment: ""
           - ubuntu: 24.04
             containerd: v2.0.5
             rootlesskit: v2.3.4
             target: rootless
             arch: arm64
             runner: "ubuntu-24.04-arm"
-            nerdctl: ""
-            comment: ""
           - ubuntu: 24.04
             containerd: v2.0.5
             rootlesskit: v2.3.4
             target: rootless-port-slirp4netns
             arch: amd64
             runner: "ubuntu-24.04"
-            nerdctl: ""
-            comment: ""
           - ubuntu: 24.04
             containerd: v2.0.5
             rootlesskit: v2.3.4
@@ -296,10 +288,10 @@ jobs:
           fi
           echo "WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622}" >> "$GITHUB_ENV"
       - name: "Test (network driver=slirp4netns, port driver=builtin)"
-        run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} -e NERDCTL=${NERDCTL} ${TEST_TARGET} /test-integration-rootless.sh ./hack/test-integration.sh -test.only-flaky=false
+        run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET} /test-integration-rootless.sh ./hack/test-integration.sh -test.only-flaky=false -test.target=${NERDCTL}
       - name: "Test (network driver=slirp4netns, port driver=builtin) (flaky)"
         if: matrix.nerdctl != 'nerdctl.gomodjail'
-        run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} -e NERDCTL=${NERDCTL} ${TEST_TARGET} /test-integration-rootless.sh ./hack/test-integration.sh -test.only-flaky=true
+        run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET} /test-integration-rootless.sh ./hack/test-integration.sh -test.only-flaky=true -test.target=${NERDCTL}
 
   test-integration-docker-compatibility:
     timeout-minutes: 40

Dockerfile.d/test-integration-rootless.sh

@@ -15,7 +15,6 @@
 #   limitations under the License.
 
 set -eux -o pipefail
-: "${NERDCTL:=}"
 if [[ "$(id -u)" = "0" ]]; then
   # Ensure securityfs is mounted for apparmor to work
   if ! mountpoint -q /sys/kernel/security; then
@@ -33,7 +32,7 @@ if [[ "$(id -u)" = "0" ]]; then
 
 	# Switch to the rootless user via SSH
 	systemctl start ssh
-	exec ssh -o StrictHostKeyChecking=no rootless@localhost NERDCTL="$NERDCTL" "$0" "$@"
+	exec ssh -o StrictHostKeyChecking=no rootless@localhost "$0" "$@"
 else
 	containerd-rootless-setuptool.sh install
 	if grep -q "options use-vc" /etc/resolv.conf; then
@@ -64,5 +63,5 @@ EOF
 	# Once ssh-ed, we lost the Dockerfile working dir, so, get back in the nerdctl checkout
 	cd /go/src/github.com/containerd/nerdctl
 	# We also lose the PATH (and SendEnv=PATH would require sshd config changes)
-	exec env PATH="/usr/local/go/bin:$PATH" NERDCTL="$NERDCTL" "$@"
+	exec env PATH="/usr/local/go/bin:$PATH" "$@"
 fi

cmd/nerdctl/builder/builder_builder_test.go

@@ -133,8 +133,7 @@ CMD ["echo", "nerdctl-test-builder-prune"]`, testutil.CommonImage)
 			{
 				Description: "Debug",
 				// `nerdctl builder debug` is currently incompatible with `docker buildx debug`.
-				// FIXME: fails with gomodjail: "timed out to access cache storage. other debug session is running?"
-				Require:    require.All(require.Not(nerdtest.Docker), require.Not(nerdtest.Gomodjail)),
+				Require:    require.All(require.Not(nerdtest.Docker)),
 				NoParallel: true,
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
 					dockerfile := fmt.Sprintf(`FROM %s

cmd/nerdctl/completion/completion_test.go

@@ -17,6 +17,7 @@
 package completion
 
 import (
+	"os/exec"
 	"testing"
 
 	"github.com/containerd/nerdctl/mod/tigron/expect"
@@ -34,6 +35,11 @@ func TestMain(m *testing.M) {
 func TestCompletion(t *testing.T) {
 	nerdtest.Setup()
 
+	// Note: some functions need to be tested without the automatic --namespace nerdctl-test argument, so we need
+	// to retrieve the binary name.
+	// Note that we know this works already, so no need to assert err.
+	bin, _ := exec.LookPath(testutil.GetTarget())
+
 	testCase := &test.Case{
 		Require: require.Not(nerdtest.Docker),
 		Setup: func(data test.Data, helpers test.Helpers) {
@@ -158,25 +164,25 @@ func TestCompletion(t *testing.T) {
 				},
 			},
 			{
-				Description: "no namespace --cgroup-manager",
+				Description: "--cgroup-manager",
 				Require:     require.Not(require.Windows),
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-					return helpers.Custom("nerdctl", "__complete", "--cgroup-manager", "")
+					return helpers.Command("__complete", "--cgroup-manager", "")
 				},
 				Expected: test.Expects(0, nil, expect.Contains("cgroupfs\n")),
 			},
 			{
-				Description: "no namespace empty",
+				Description: "empty",
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-					return helpers.Custom("nerdctl", "__complete", "")
+					return helpers.Command("__complete", "")
 				},
 				Expected: test.Expects(0, nil, expect.Contains("run\t")),
 			},
 			{
 				Description: "namespace space empty",
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
 					// mind {"--namespace=nerdctl-test"} vs {"--namespace", "nerdctl-test"}
-					return helpers.Custom("nerdctl", "__complete", "--namespace", string(helpers.Read(nerdtest.Namespace)), "")
+					return helpers.Custom(bin, "__complete", "--namespace", string(helpers.Read(nerdtest.Namespace)), "")
 				},
 				Expected: test.Expects(0, nil, expect.Contains("run\t")),
 			},
@@ -199,7 +205,7 @@ func TestCompletion(t *testing.T) {
 				Description: "namespace run -i",
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
 					// mind {"--namespace=nerdctl-test"} vs {"--namespace", "nerdctl-test"}
-					return helpers.Custom("nerdctl", "__complete", "--namespace", string(helpers.Read(nerdtest.Namespace)), "run", "-i", "")
+					return helpers.Custom(bin, "__complete", "--namespace", string(helpers.Read(nerdtest.Namespace)), "run", "-i", "")
 				},
 				Expected: test.Expects(0, nil, expect.Contains(testutil.CommonImage+"\n")),
 			},

cmd/nerdctl/compose/compose_up_test.go

@@ -27,6 +27,7 @@ import (
 	"gotest.tools/v3/icmd"
 
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 // https://github.com/containerd/nerdctl/issues/1942
@@ -49,7 +50,8 @@ services:
 		ExitCode: 1,
 		Err:      `exec: \"invalid\": executable file not found in $PATH`,
 	}
-	if base.Target == testutil.Docker {
+	// Docker expected err is different
+	if nerdtest.IsDocker() {
 		expected.Err = `unknown or invalid runtime name: invalid`
 	}
 	c.Assert(expected)

cmd/nerdctl/container/container_cp_acid_linux_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 // This is a separate set of tests for cp specifically meant to test corner or extreme cases that do not fit in the normal testing rig
@@ -87,7 +88,7 @@ func TestCopyAcid(t *testing.T) {
 		setup()
 
 		expectedErr := containerutil.ErrTargetIsReadOnly.Error()
-		if testutil.GetTarget() == testutil.Docker {
+		if nerdtest.IsDocker() {
 			expectedErr = ""
 		}
 

cmd/nerdctl/container/container_cp_linux_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 // For the test matrix, see https://docs.docker.com/engine/reference/commandline/cp/
@@ -898,7 +899,7 @@ func cpTestHelper(t *testing.T, tg *testgroup) {
 				setup()
 
 				// If Docker, removes the err part of expectation
-				if testutil.GetTarget() == testutil.Docker {
+				if nerdtest.IsDocker() {
 					testCase.expect.Err = ""
 				}
 
@@ -938,7 +939,7 @@ func cpTestHelper(t *testing.T, tg *testgroup) {
 					cmd = base.Cmd("cp", containerStopped+":"+sourceSpec, destinationSpec)
 				}
 
-				if rootlessutil.IsRootless() && testutil.GetTarget() == testutil.Nerdctl {
+				if rootlessutil.IsRootless() && !nerdtest.IsDocker() {
 					cmd.Assert(
 						icmd.Expected{
 							ExitCode: 1,

cmd/nerdctl/container/container_create_linux_test.go

@@ -126,7 +126,7 @@ func TestCreateWithMACAddress(t *testing.T) {
 				assert.Assert(t, strings.Contains(res.Stdout(), expect), fmt.Sprintf("expected output to contain %q: %q", expect, res.Stdout()))
 				assert.Assert(t, res.ExitCode == 0, "Command should have succeeded")
 			} else {
-				if testutil.GetTarget() == testutil.Docker &&
+				if nerdtest.IsDocker() &&
 					(network == networkIPvlan || network == "container:whatever"+tID) {
 					// unlike nerdctl
 					// when using network ipvlan or container in Docker
@@ -137,7 +137,7 @@ func TestCreateWithMACAddress(t *testing.T) {
 				}
 
 				// See https://github.com/containerd/nerdctl/issues/3101
-				if testutil.GetTarget() == testutil.Docker &&
+				if nerdtest.IsDocker() &&
 					(network == networkBridge) {
 					expect = ""
 				}

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -198,7 +198,7 @@ func TestContainerInspectState(t *testing.T) {
 	// nerdctl: run error produces a nil Task, so the Status is empty because Status comes from Task.
 	// docker : run error gives => `Status=created` as  in docker there is no a separation between container and Task.
 	errStatus := ""
-	if base.Target == testutil.Docker {
+	if nerdtest.IsDocker() {
 		errStatus = "created"
 	}
 	testCases := []testCase{
@@ -295,7 +295,7 @@ func TestContainerInspectHostConfigDefaults(t *testing.T) {
 
 	// Hostconfig default values differ with Docker.
 	// This is because we directly retrieve the configured values instead of using preset defaults.
-	if testutil.GetTarget() == testutil.Docker {
+	if nerdtest.IsDocker() {
 		hc.Driver = ""
 		hc.GroupAddSize = 0
 		hc.ShmSize = int64(67108864) // Docker default 64M
@@ -399,7 +399,7 @@ func TestContainerInspectHostConfigPID(t *testing.T) {
 
 	var hc hostConfigValues
 
-	if testutil.GetTarget() == testutil.Docker {
+	if nerdtest.IsDocker() {
 		hc.PidMode = "container:" + containerID1
 	} else {
 		hc.PidMode = containerID1
@@ -444,7 +444,7 @@ func TestContainerInspectDevices(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if testutil.GetTarget() == testutil.Docker {
+	if nerdtest.IsDocker() {
 		dir = "/dev/zero"
 	}
 

cmd/nerdctl/container/container_kill_linux_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	iptablesutil "github.com/containerd/nerdctl/v2/pkg/testutil/iptables"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 // TestKillCleanupForwards runs a container that exposes a port and then kill it.
@@ -66,7 +67,7 @@ func TestKillCleanupForwards(t *testing.T) {
 
 	// define iptables chain name depending on the target (docker/nerdctl)
 	var chain string
-	if testutil.GetTarget() == testutil.Docker {
+	if nerdtest.IsDocker() {
 		chain = "DOCKER"
 	} else {
 		redirectChain := "CNI-HOSTPORT-DNAT"