From 727fa0e67d952f93757fa5d86d2ff91d96f0ad1b Mon Sep 17 00:00:00 2001 From: "hiroto.toyoda" Date: Tue, 25 Aug 2026 03:48:03 +0900 Subject: [PATCH] test(build): re-enable wrong ssh key id test moby/buildkit#5558, which this test was disabled for, is fixed and released well before the buildkit v0.26.3 currently vendored here. Verified the re-enabled case passes (3 consecutive runs). Signed-off-by: hiroto.toyoda --- pkg/e2e/build_test.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkg/e2e/build_test.go b/pkg/e2e/build_test.go index 399250894..af5c80a2e 100644 --- a/pkg/e2e/build_test.go +++ b/pkg/e2e/build_test.go @@ -174,20 +174,17 @@ func TestBuildSSH(t *testing.T) { c.RunDockerCmd(t, "image", "inspect", "build-test-ssh") }) - /* - FIXME disabled waiting for https://github.com/moby/buildkit/issues/5558 - t.Run("build failed with wrong ssh key id from CLI", func(t *testing.T) { - c.RunDockerOrExitError(t, "rmi", "build-test-ssh") + t.Run("build failed with wrong ssh key id from CLI", func(t *testing.T) { + c.RunDockerOrExitError(t, "rmi", "build-test-ssh") - res := c.RunDockerComposeCmdNoCheck(t, "-f", "fixtures/build-test/ssh/compose-without-ssh.yaml", - "--project-directory", "fixtures/build-test/ssh", "build", "--no-cache", "--ssh", - "wrong-ssh=./fixtures/build-test/ssh/fake_rsa") - res.Assert(t, icmd.Expected{ - ExitCode: 1, - Err: "unset ssh forward key fake-ssh", - }) + res := c.RunDockerComposeCmdNoCheck(t, "-f", "fixtures/build-test/ssh/compose-without-ssh.yaml", + "--project-directory", "fixtures/build-test/ssh", "build", "--no-cache", "--ssh", + "wrong-ssh=./fixtures/build-test/ssh/fake_rsa") + res.Assert(t, icmd.Expected{ + ExitCode: 1, + Err: "unset ssh forward key fake-ssh", }) - */ + }) t.Run("build succeed as part of up with ssh from Compose file", func(t *testing.T) { c.RunDockerOrExitError(t, "rmi", "build-test-ssh")