From fd7528d448fc03a623f83228b081ecf5e84f5ecb Mon Sep 17 00:00:00 2001 From: apostasie Date: Fri, 18 Oct 2024 16:11:38 -0700 Subject: [PATCH] Debuggin docker failures Signed-off-by: apostasie --- .github/workflows/test.yml | 11 ++++++++++- .../container/container_run_restart_linux_test.go | 1 + pkg/testutil/testutil.go | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c6d68f83e6..2a73d378df6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -267,6 +267,10 @@ jobs: set -eux -o pipefail docker info docker version + - name: "TEMP DEBUG" + run: | + systemctl list-unit-files | grep docker + systemctl is-active docker - name: "Register QEMU (tonistiigi/binfmt)" run: | # `--install all` will only install emulation for architectures that cannot be natively executed @@ -285,7 +289,12 @@ jobs: - name: "Ensure that the IPv6 integration test suite is compatible with Docker" run: ./hack/test-integration.sh -test.target=docker -test.only-ipv6 - name: "Ensure that the integration test suite is compatible with Docker (flaky only)" - run: ./hack/test-integration.sh -test.target=docker -test.only-flaky + run: | + systemctl list-unit-files | grep docker + systemctl is-active docker + ./hack/test-integration.sh -test.target=docker -test.only-flaky + systemctl list-unit-files | grep docker + systemctl is-active docker test-integration-windows: timeout-minutes: 30 diff --git a/cmd/nerdctl/container/container_run_restart_linux_test.go b/cmd/nerdctl/container/container_run_restart_linux_test.go index c3411c6aaeb..3d531f61c50 100644 --- a/cmd/nerdctl/container/container_run_restart_linux_test.go +++ b/cmd/nerdctl/container/container_run_restart_linux_test.go @@ -70,6 +70,7 @@ func TestRunRestart(t *testing.T) { } assert.NilError(t, check(30)) + base.EnsureDaemonActive() base.KillDaemon() base.EnsureDaemonActive() diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 525225fb996..d34a5c9c775 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -181,6 +181,9 @@ func (b *Base) EnsureDaemonActive() { ) for i := 0; i < maxRetry; i++ { cmd := exec.Command("systemctl", append(systemctlArgs, "is-active", target)...) + b.T.Log(cmd.Env) + b.T.Log(cmd.Args) + b.T.Log(cmd.Dir) out, err := cmd.CombinedOutput() b.T.Logf("(retry=%d) %s", i, string(out)) if err == nil {