From c72f161afb6bf7af12bc5f8e0ed358746fd05cb5 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Wed, 21 Dec 2022 19:27:03 +0100 Subject: [PATCH] change the way finding the just built compose binary Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- pkg/e2e/framework.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/e2e/framework.go b/pkg/e2e/framework.go index c7dacaef71..62fe33bc77 100644 --- a/pkg/e2e/framework.go +++ b/pkg/e2e/framework.go @@ -134,8 +134,8 @@ func initializePlugins(t testing.TB, configDir string) { require.NoError(t, os.MkdirAll(filepath.Join(configDir, "cli-plugins"), 0o755), "Failed to create cli-plugins directory") composePlugin, err := findExecutable(DockerComposeExecutableName) - if os.IsNotExist(err) { - t.Logf("WARNING: docker-compose cli-plugin not found") + if err != nil { + t.Errorf("WARNING: docker-compose cli-plugin not found %s", err.Error()) } buildxPlugin, err := findPluginExecutable(DockerBuildxExecutableName) if os.IsNotExist(err) { @@ -159,8 +159,11 @@ func dirContents(dir string) []string { } func findExecutable(executableName string) (string, error) { - _, filename, _, _ := runtime.Caller(0) - root := filepath.Join(filepath.Dir(filename), "..", "..") + filename, err := os.Getwd() + if err != nil { + return "", err + } + root := filepath.Join(filepath.Dir(filename), "..") buildPath := filepath.Join(root, "bin", "build") bin, err := filepath.Abs(filepath.Join(buildPath, executableName))