From 81bd3fb9f91539814e7385b83b83cb0064919d4a Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Fri, 7 Oct 2022 21:33:54 +0200 Subject: [PATCH] tests: Pass only etcd related environment variables during e2e tests Signed-off-by: Marek Siarkowicz --- tests/framework/e2e/util.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/framework/e2e/util.go b/tests/framework/e2e/util.go index 8c3b573ca..07a36cb47 100644 --- a/tests/framework/e2e/util.go +++ b/tests/framework/e2e/util.go @@ -127,6 +127,10 @@ func mergeEnvVariables(envVars map[string]string) []string { currVars := os.Environ() for _, v := range currVars { p := strings.Split(v, "=") + // TODO: Remove PATH when we stop using system binaries (`awk`, `echo`) + if !strings.HasPrefix(p[0], "ETCD_") && !strings.HasPrefix(p[0], "ETCDCTL_") && !strings.HasPrefix(p[0], "EXPECT_") && p[0] != "PATH" { + continue + } if _, ok := envVars[p[0]]; !ok { env = append(env, fmt.Sprintf("%s=%s", p[0], p[1])) }