Merge pull request #403 from timflannagan/ci/fix-collect-artifacts

openshift-merge-robot · web-flow · commit a3afae8215db · 2022-10-21T13:18:23.000-04:00
test/e2e: Preserve the existing environment when using exec.Command
diff --git a/staging/operator-lifecycle-manager/test/e2e/ctx/ctx.go b/staging/operator-lifecycle-manager/test/e2e/ctx/ctx.go
@@ -130,7 +130,7 @@ func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {
 	}
 
 	cmd := exec.Command(ctx.artifactsScriptPath)
-	cmd.Env = append(cmd.Env, envvars...)
+	cmd.Env = append(os.Environ(), envvars...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`cmd := exec.Command(ctx.artifactsScriptPath)`
`133`		`- cmd.Env = append(cmd.Env, envvars...)`
	`133`	`+ cmd.Env = append(os.Environ(), envvars...)`
`134`	`134`	`cmd.Stdout = os.Stdout`
`135`	`135`	`cmd.Stderr = os.Stderr`
`136`	`136`	`if err := cmd.Run(); err != nil {`