Fix templates for some tests and skip 1.31 tests (#8771)

aws · Sep 15, 2024 · 50b47f7 · 50b47f7
1 parent 5cb701e
commit 50b47f7
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 3 deletions.
diff --git a/test/e2e/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml
@@ -149,3 +149,70 @@ skipped_tests:
 - TestTinkerbellKubernetes131UbuntuCuratedPackagesAdotSimpleFlow
 - TestTinkerbellKubernetes131UbuntuCuratedPackagesPrometheusSimpleFlow
 - TestTinkerbellKubernetes131UbuntuCuratedPackagesClusterAutoscalerSimpleFlow
+
+# Skip 1.31 tests which require upgrading CAPI version to latest
+- TestDockerKubernetes131EtcdScaleUp
+- TestDockerKubernetes131EtcdScaleDown
+- TestDockerKubernetes131Taints
+
+- TestVSphereKubernetes131BottlerocketAPIServerExtraArgsUpgradeFlow
+- TestVSphereKubernetes131BottlerocketLabelsUpgradeFlow
+- TestVSphereKubernetes131UbuntuLabelsUpgradeFlow
+- TestVSphereKubernetes131UbuntuTaintsUpgradeFlow
+- TestVSphereKubernetes131BottlerocketTaintsUpgradeFlow
+- TestVSphereInPlaceUpgradeMulticlusterWorkloadClusterK8sUpgrade130To131
+- TestVSphereKubernetesUbuntu131EtcdEncryption
+- TestVSphereKubernetesBottlerocket131EtcdEncryption
+- TestVSphereKubernetes131BottlerocketEtcdScaleUp
+- TestVSphereKubernetes131BottlerocketEtcdScaleDown
+- TestVSphereKubernetes131UbuntuEtcdScaleUp
+- TestVSphereKubernetes131UbuntuEtcdScaleDown
+
+- TestCloudStackKubernetes131Redhat8APIServerExtraArgsUpgradeFlow
+- TestCloudStackKubernetes131RedhatLabelsUpgradeFlow
+- TestCloudStackKubernetes131RedhatTaintsUpgradeFlow
+- TestCloudStackKubernetes131Redhat8ToRedhat9Upgrade
+
+# Skip 1.31 tests which are failing due to missing node for the machine
+- TestNutanixKubernetes131UbuntuControlPlaneNodeScaleDown3To1
+- TestNutanixKubernetes131UbuntuWorkerNodeScaleDown3To1
+- TestNutanixKubernetes130To131UbuntuUpgrade
+- TestNutanixKubernetes130to131RedHatUpgrade
+- TestNutanixKubernetes130to131RedHat9Upgrade
+- TestNutanixKubernetes130To131StackedEtcdUbuntuUpgrade
+
+- TestVSphereKubernetes130To131AWSIamAuthUpgrade
+- TestVSphereKubernetes130To131GitFluxUpgrade
+- TestVSphereKubernetes130To131OIDCUpgrade
+- TestVSphereKubernetes131ThreeReplicasFiveWorkersSimpleFlow
+- TestVSphereKubernetes131StackedEtcdUbuntu
+- TestVSphereKubernetes130UbuntuTo131Upgrade
+- TestVSphereKubernetes130To131Ubuntu2204StackedEtcdUpgrade
+- TestVSphereKubernetes130To131Ubuntu2204Upgrade
+- TestVSphereKubernetes130To131StackedEtcdRedHatUpgrade
+- TestVSphereKubernetes130To131RedHatUpgrade
+- TestVSphereKubernetes130UbuntuTo131MultipleFieldsUpgrade
+- TestVSphereKubernetes130UbuntuTo131StackedEtcdUpgrade
+- TestVSphereKubernetes131UbuntuControlPlaneNodeUpgrade
+- TestVSphereKubernetes131UbuntuInPlaceCPScaleDown3To1
+- TestVSphereKubernetes131UbuntuInPlaceCPScaleUp1To3
+- TestVSphereKubernetes130to131UbuntuEtcdScaleUp
+- TestVSphereKubernetes130to131UbuntuEtcdScaleDown
+
+- TestCloudStackKubernetes130to131AWSIamAuthUpgrade
+- TestCloudStackKubernetes130To131GitFluxUpgrade
+- TestCloudStackKubernetes130To131OIDCUpgrade
+- TestCloudStackKubernetes131ThreeReplicasFiveWorkersSimpleFlow
+- TestCloudStackKubernetes130To131Redhat8UnstackedEtcdUpgrade
+- TestCloudStackKubernetes130To131Redhat8StackedEtcdUpgrade
+- TestCloudStackKubernetes130To131Redhat9StackedEtcdUpgrade
+- TestCloudStackKubernetes130To131Redhat9UnstackedEtcdUpgrade
+- TestCloudStackKubernetes130RedhatTo131UpgradeWithCheckpoint
+- TestCloudStackKubernetes131RedhatControlPlaneNodeUpgrade
+- TestCloudStackKubernetes130To131RedhatMultipleFieldsUpgrade
+- TestCloudStackKubernetes130To131StackedEtcdRedhatMultipleFieldsUpgrade
+
+# Skip 1.31 labels and taints API tests which are failing validation on CP and worker node taints
+- TestDockerKubernetes131UpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI
+- TestVSphereKubernetes131UpgradeLabelsTaintsUbuntuAPI
+- TestVSphereKubernetes131UpgradeLabelsTaintsBottleRocketGitHubFluxAPI
diff --git a/test/e2e/vsphere_test.go b/test/e2e/vsphere_test.go
@@ -2047,7 +2047,7 @@ func TestVSphereKubernetes131OIDC(t *testing.T) {
 }
 
 func TestVSphereKubernetes130To131OIDCUpgrade(t *testing.T) {
-	provider := framework.NewVSphere(t, framework.WithUbuntu129())
+	provider := framework.NewVSphere(t, framework.WithUbuntu130())
 	test := framework.NewClusterE2ETest(
 		t,
 		provider,
@@ -4174,7 +4174,7 @@ func TestVSphereKubernetes128UbuntuTo129InPlaceUpgradeCPOnly(t *testing.T) {
 }
 
 func TestVSphereKubernetes130UbuntuTo131InPlaceUpgradeWorkerOnly(t *testing.T) {
-	provider := framework.NewVSphere(t, framework.WithUbuntu129())
+	provider := framework.NewVSphere(t, framework.WithUbuntu130())
 	kube130 := v1alpha1.Kube130
 	kube131 := v1alpha1.Kube131
 	test := framework.NewClusterE2ETest(
@@ -6169,7 +6169,7 @@ func TestVSphereUpgradeKubernetes131CiliumUbuntuGitHubFluxAPI(t *testing.T) {
 			api.ClusterToConfigFiller(
 				api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways),
 			),
-			vsphere.WithUbuntu130(),
+			vsphere.WithUbuntu131(),
 		)
 		wc.ValidateClusterState()
 		test.DeleteWorkloadClusterFromGit(wc)