Merge pull request #14560 from serathius/env
tests: Pass only etcd related environment variables during e2e testsdependabot/go_modules/go.uber.org/atomic-1.10.0
commit
e614eec948
|
@ -143,6 +143,10 @@ func mergeEnvVariables(envVars map[string]string) []string {
|
||||||
currVars := os.Environ()
|
currVars := os.Environ()
|
||||||
for _, v := range currVars {
|
for _, v := range currVars {
|
||||||
p := strings.Split(v, "=")
|
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 {
|
if _, ok := envVars[p[0]]; !ok {
|
||||||
env = append(env, fmt.Sprintf("%s=%s", p[0], p[1]))
|
env = append(env, fmt.Sprintf("%s=%s", p[0], p[1]))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue