Merge pull request #18189 from hakman/fix-pre-test

k8s-ci-robot · web-flow · commit 80453cc7c196 · 2026-04-14T14:56:38.000+05:30
tests: fix KOPS_BASE_URL for build-kubernetes runs
diff --git a/tests/e2e/kubetest2-kops/deployer/build.go b/tests/e2e/kubetest2-kops/deployer/build.go
@@ -127,7 +127,7 @@ func (d *deployer) verifyBuildFlags() error {
 		}
 		d.StageLocation = stageLocation
 	}
-	if d.KopsBaseURL == "" && os.Getenv("KOPS_BASE_URL") == "" {
+	if !d.BuildOptions.BuildKubernetes && d.KopsBaseURL == "" && os.Getenv("KOPS_BASE_URL") == "" {
 		d.KopsBaseURL = strings.Replace(d.StageLocation, "gs://", "https://storage.googleapis.com/", 1)
 	}
 
diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go
@@ -58,8 +58,8 @@ func (d *deployer) Up() error {
 		d.KopsBaseURL = baseURL
 	}
 
-	// In PreTestCmd, we need KOPS_BASE_URL to be set for kops calls
-	if os.Getenv("KOPS_BASE_URL") == "" {
+	// PreTestCmd inherits the process environment rather than d.env().
+	if d.KopsBaseURL != "" {
 		os.Setenv("KOPS_BASE_URL", d.KopsBaseURL)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (d *deployer) verifyBuildFlags() error {`
`127`	`127`	`}`
`128`	`128`	`d.StageLocation = stageLocation`
`129`	`129`	`}`
`130`		`- if d.KopsBaseURL == "" && os.Getenv("KOPS_BASE_URL") == "" {`
	`130`	`+ if !d.BuildOptions.BuildKubernetes && d.KopsBaseURL == "" && os.Getenv("KOPS_BASE_URL") == "" {`
`131`	`131`	`d.KopsBaseURL = strings.Replace(d.StageLocation, "gs://", "https://storage.googleapis.com/", 1)`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ func (d *deployer) Up() error {`
`58`	`58`	`d.KopsBaseURL = baseURL`
`59`	`59`	`}`
`60`	`60`
`61`		`- // In PreTestCmd, we need KOPS_BASE_URL to be set for kops calls`
`62`		`- if os.Getenv("KOPS_BASE_URL") == "" {`
	`61`	`+ // PreTestCmd inherits the process environment rather than d.env().`
	`62`	`+ if d.KopsBaseURL != "" {`
`63`	`63`	`os.Setenv("KOPS_BASE_URL", d.KopsBaseURL)`
`64`	`64`	`}`
`65`	`65`