From 91339efb6dc85bf296c2289dbe2eb4849cd25ef7 Mon Sep 17 00:00:00 2001
From: Cavaughn Browne <113555337+cxbrowne1207@users.noreply.github.com>
Date: Tue, 13 Feb 2024 13:26:09 -0600
Subject: [PATCH] add quick e2e tests for vsphere (#7564)

---
 test/e2e/QUICK_TESTS.yaml |  3 +++
 test/e2e/vsphere_test.go  | 50 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/test/e2e/QUICK_TESTS.yaml b/test/e2e/QUICK_TESTS.yaml
index dd8e5bc8ee63..630f4db70178 100644
--- a/test/e2e/QUICK_TESTS.yaml
+++ b/test/e2e/QUICK_TESTS.yaml
@@ -2,9 +2,12 @@ quick_tests:
 # Docker
 - TestDocker.*128
 # vSphere
+- ^TestVSphereKubernetes127To128RedHatUpgrade$
+- TestVSphereKubernetes127To128StackedEtcdRedHatUpgrade
 - ^TestVSphereKubernetes127UbuntuTo128Upgrade$
 - TestVSphereKubernetes127UbuntuTo128StackedEtcdUpgrade
 - TestVSphereKubernetes127To128Ubuntu2204Upgrade
+- TestVSphereKubernetes127To128Ubuntu2204StackedEtcdUpgrade
 - TestVSphereKubernetes128Ubuntu2004To2204Upgrade
 - TestVSphereKubernetes127BottlerocketTo128Upgrade
 - TestVSphereKubernetes127BottlerocketTo128StackedEtcdUpgrade
diff --git a/test/e2e/vsphere_test.go b/test/e2e/vsphere_test.go
index 19ca4deedc40..d18b3bc0fb22 100644
--- a/test/e2e/vsphere_test.go
+++ b/test/e2e/vsphere_test.go
@@ -1549,6 +1549,37 @@ func TestVSphereKubernetes128RedHatSimpleFlow(t *testing.T) {
 	runSimpleFlow(test)
 }
 
+func TestVSphereKubernetes127To128RedHatUpgrade(t *testing.T) {
+	provider := framework.NewVSphere(t, framework.WithRedHat127VSphere())
+	test := framework.NewClusterE2ETest(
+		t,
+		provider,
+		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
+	)
+	runSimpleUpgradeFlow(
+		test,
+		v1alpha1.Kube128,
+		framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
+		provider.WithProviderUpgrade(provider.Redhat128Template()),
+	)
+}
+
+func TestVSphereKubernetes127To128StackedEtcdRedHatUpgrade(t *testing.T) {
+	provider := framework.NewVSphere(t, framework.WithRedHat127VSphere())
+	test := framework.NewClusterE2ETest(
+		t,
+		provider,
+		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
+		framework.WithClusterFiller(api.WithStackedEtcdTopology()),
+	)
+	runSimpleUpgradeFlow(
+		test,
+		v1alpha1.Kube128,
+		framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
+		provider.WithProviderUpgrade(provider.Redhat128Template()),
+	)
+}
+
 func TestVSphereKubernetes128ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) {
 	test := framework.NewClusterE2ETest(
 		t,
@@ -1880,6 +1911,25 @@ func TestVSphereKubernetes127To128Ubuntu2204Upgrade(t *testing.T) {
 	)
 }
 
+func TestVSphereKubernetes127To128Ubuntu2204StackedEtcdUpgrade(t *testing.T) {
+	provider := framework.NewVSphere(t)
+	test := framework.NewClusterE2ETest(
+		t,
+		provider,
+	).WithClusterConfig(
+		provider.WithKubeVersionAndOS(v1alpha1.Kube127, framework.Ubuntu2204, nil),
+		api.ClusterToConfigFiller(
+			api.WithStackedEtcdTopology(),
+		),
+	)
+	runSimpleUpgradeFlowWithoutClusterConfigGeneration(
+		test,
+		v1alpha1.Kube128,
+		framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
+		provider.WithProviderUpgrade(provider.Ubuntu2204Kubernetes128Template()),
+	)
+}
+
 func TestVSphereKubernetes126Ubuntu2004To2204Upgrade(t *testing.T) {
 	provider := framework.NewVSphere(t)
 	test := framework.NewClusterE2ETest(