Fix upgrade from latest minor release E2E test failures (#9385)

sp1999 · web-flow · commit cbe513d0b17b · 2025-03-07T05:55:10.000+05:30
diff --git a/test/framework/cluster.go b/test/framework/cluster.go
@@ -487,7 +487,6 @@ func (e *ClusterE2ETest) generateHardwareConfig(opts ...CommandOpt) {
 }
 
 func (e *ClusterE2ETest) GenerateClusterConfigForVersion(eksaVersion string, opts ...CommandOpt) {
-	e.generateClusterConfigObjects(opts...)
 	if eksaVersion != "" {
 		// LicenseToken field was introduced in cluster spec only in release-22
 		// attempting to populate the field for any prior versions would break the api.
@@ -509,6 +508,7 @@ func (e *ClusterE2ETest) GenerateClusterConfigForVersion(eksaVersion string, opt
 		}
 	}
 
+	e.generateClusterConfigObjects(opts...)
 	e.buildClusterConfigFile()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,6 @@ func (e *ClusterE2ETest) generateHardwareConfig(opts ...CommandOpt) {`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`func (e *ClusterE2ETest) GenerateClusterConfigForVersion(eksaVersion string, opts ...CommandOpt) {`
`490`		`- e.generateClusterConfigObjects(opts...)`
`491`	`490`	`if eksaVersion != "" {`
`492`	`491`	`// LicenseToken field was introduced in cluster spec only in release-22`
`493`	`492`	`// attempting to populate the field for any prior versions would break the api.`
`@@ -509,6 +508,7 @@ func (e *ClusterE2ETest) GenerateClusterConfigForVersion(eksaVersion string, opt`
`509`	`508`	`}`
`510`	`509`	`}`
`511`	`510`
	`511`	`+ e.generateClusterConfigObjects(opts...)`
`512`	`512`	`e.buildClusterConfigFile()`
`513`	`513`	`}`
`514`	`514`