Fix 1-30 tests using wrong templates/kube version (#8224)

* Fix 1-30 tests using wrong templates/kube version and skip packages tests for 1.30 Signed-off-by: Rahul Ganesh <rahulgab@amazon.com> * Rebase to factor in new vsphere tests Signed-off-by: Rahul Ganesh <rahulgab@amazon.com> --------- Signed-off-by: Rahul Ganesh <rahulgab@amazon.com> Co-authored-by: Rahul Ganesh <rahulgab@amazon.com>
aws · May 28, 2024 · 7abe87c · 7abe87c
1 parent 0e112c0
commit 7abe87c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/test/e2e/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml
@@ -45,6 +45,23 @@ skipped_tests:
 - TestVSphereKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow
 - TestVSphereKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow
 - TestVSphereKubernetes130UbuntuWorkloadClusterCuratedPackagesSimpleFlow
+- TestVSphereKubernetes130BottleRocketWorkloadClusterCuratedPackagesCertManagerSimpleFlow
+- TestVSphereKubernetes130UbuntuWorkloadClusterCuratedPackagesCertManagerSimpleFlow
+- TestVSphereKubernetes130UbuntuWorkloadClusterCuratedPackagesEmissarySimpleFlow
+- TestVSphereKubernetes130BottleRocketCuratedPackagesClusterAutoscalerSimpleFlow
+- TestVSphereKubernetes130BottleRocketCuratedPackagesPrometheusSimpleFlow
+- TestVSphereKubernetes130BottleRocketWorkloadClusterCuratedPackagesSimpleFlow
+- TestVSphereKubernetes130BottleRocketWorkloadClusterCuratedPackagesEmissarySimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesSimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesEmissarySimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesHarborSimpleFlow
+- TestCloudStackKubernetes130RedhatWorkloadClusterCuratedPackagesSimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesPrometheusSimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesAdotUpdateFlow
+- TestCloudStackKubernetes130RedHatCuratedPackagesClusterAutoscalerSimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesAdotSimpleFlow
+- TestCloudStackKubernetes130RedhatCuratedPackagesCertManagerSimpleFlow
+- TestCloudStackKubernetes130RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow
 
 # Snow
 - TestSnowKubernetes125SimpleFlow

diff --git a/test/e2e/cloudstack_test.go b/test/e2e/cloudstack_test.go
@@ -932,7 +932,7 @@ func TestCloudStackKubernetes129To130GitFluxUpgrade(t *testing.T) {
 		test,
 		v1alpha1.Kube130,
 		framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)),
-		provider.WithProviderUpgrade(provider.Redhat9Kubernetes126Template()),
+		provider.WithProviderUpgrade(provider.Redhat9Kubernetes130Template()),
 	)
 }
 
@@ -1766,7 +1766,7 @@ func TestCloudStackKubernetes129To130OIDCUpgrade(t *testing.T) {
 	)
 	runUpgradeFlowWithOIDC(
 		test,
-		v1alpha1.Kube126,
+		v1alpha1.Kube130,
 		framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)),
 		provider.WithProviderUpgrade(provider.Redhat9Kubernetes130Template()),
 	)

diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go
@@ -139,7 +139,7 @@ func TestTinkerbellKubernetes129UbuntuTo130UpgradeWorkerOnly(t *testing.T) {
 		t,
 		provider,
 		framework.WithClusterFiller(),
-		framework.WithClusterFiller(api.WithKubernetesVersion(kube129)),
+		framework.WithClusterFiller(api.WithKubernetesVersion(kube130)),
 		framework.WithClusterFiller(api.WithControlPlaneCount(1)),
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube129)),
@@ -1534,7 +1534,7 @@ func TestTinkerbellKubernetes130UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing
 			framework.WithCustomTinkerbellMachineConfig(nodeGroupLabel2),
 		),
 		framework.WithClusterFiller(
-			api.WithKubernetesVersion(v1alpha1.Kube129),
+			api.WithKubernetesVersion(v1alpha1.Kube130),
 			api.WithControlPlaneLabel(cpKey1, cpVal1),
 			api.WithControlPlaneTaints([]corev1.Taint{framework.NoScheduleTaint()}),
 			api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate
@@ -1587,7 +1587,7 @@ func TestTinkerbellAirgappedKubernetes130UbuntuProxyConfigFlow(t *testing.T) {
 func TestTinkerbellKubernetes130UbuntuOOB(t *testing.T) {
 	test := framework.NewClusterE2ETest(
 		t,
-		framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()),
+		framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
 		framework.WithOOBConfiguration(),
 		framework.WithControlPlaneHardware(1),

diff --git a/test/e2e/vsphere_test.go b/test/e2e/vsphere_test.go
@@ -234,7 +234,7 @@ func TestVSphereKubernetes130BottleRocketAWSIamAuth(t *testing.T) {
 		t,
 		framework.NewVSphere(t, framework.WithBottleRocket130()),
 		framework.WithAWSIam(),
-		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)),
+		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
 	)
 	runAWSIamAuthFlow(test)
 }
@@ -2628,7 +2628,7 @@ func TestVSphereKubernetes130BottleRocketWithNTP(t *testing.T) {
 	test := framework.NewClusterE2ETest(
 		t,
 		framework.NewVSphere(
-			t, framework.WithBottleRocket129(),
+			t, framework.WithBottleRocket130(),
 			framework.WithNTPServersForAllMachines(),
 			framework.WithSSHAuthorizedKeyForAllMachines(""), // set SSH key to empty
 		),
@@ -3527,7 +3527,7 @@ func TestVSphereKubernetes130UbuntuControlPlaneNodeUpgrade(t *testing.T) {
 	)
 	runSimpleUpgradeFlow(
 		test,
-		v1alpha1.Kube129,
+		v1alpha1.Kube130,
 		framework.WithClusterUpgrade(api.WithControlPlaneCount(3)),
 	)
 }
@@ -4150,7 +4150,7 @@ func TestVSphereKubernetes129To130UbuntuInPlaceUpgradeFromLatestMinorRelease(t *
 	test.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release))
 	test.UpdateClusterConfig(
 		api.ClusterToConfigFiller(
-			api.WithKubernetesVersion(v1alpha1.Kube130),
+			api.WithKubernetesVersion(v1alpha1.Kube129),
 			api.WithStackedEtcdTopology(),
 		),
 		api.VSphereToConfigFiller(