Skip to content

Commit 9af2858

Browse files
authored
Fix NFR upgrade tests (#4371)
Problem: The NFR upgrade tests were installing `edge` as the initial version of NGF, when it should be installing the most recent release of NGF. Solution: Install the most recent release instead of edge when installing NGF for the upgrade test.
1 parent 2a78ff1 commit 9af2858

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

tests/suite/system_suite_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,21 +231,14 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo
231231
switch {
232232
// if we aren't installing from the public charts, then set the custom images
233233
case !strings.HasPrefix(cfg.chartPath, "oci://"):
234-
GinkgoWriter.Printf("Chart path doesn't have prefix 'oci://'\n")
234+
GinkgoWriter.Printf("Installing chart from local directory\n")
235235
installCfg.NgfImageRepository = *ngfImageRepository
236236
installCfg.NginxImageRepository = *nginxImageRepository
237237
if *plusEnabled && cfg.nfr {
238238
installCfg.NginxImageRepository = *nginxPlusImageRepository
239239
}
240240
installCfg.ImageTag = *imageTag
241241
installCfg.ImagePullPolicy = *imagePullPolicy
242-
case version == "edge":
243-
GinkgoWriter.Printf("Using NGF image repository %q with version 'edge'\n", *ngfImageRepository)
244-
chartVersion = "0.0.0-edge"
245-
installCfg.ChartVersion = chartVersion
246-
if *plusEnabled && cfg.nfr {
247-
installCfg.NginxImageRepository = fmt.Sprintf(formatNginxPlusEdgeImagePath, *gkeProject)
248-
}
249242
case *plusEnabled && cfg.nfr:
250243
installCfg.NginxImageRepository = fmt.Sprintf(formatNginxPlusEdgeImagePath, *gkeProject)
251244
}

0 commit comments

Comments
 (0)