Add more tests to CAPI tests

kubernetes-sigs · Jun 10, 2021 · b7ed98a · b7ed98a
1 parent 7a17b38
commit b7ed98a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/test/e2e/capi_test.go b/test/e2e/capi_test.go
@@ -27,7 +27,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
-	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/util"
 )
 
@@ -83,6 +82,20 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 		})
 	})
 
+	Context("Running the KCP upgrade spec in a HA cluster using scale in rollout", func() {
+		capi_e2e.KCPUpgradeSpec(context.TODO(), func() capi_e2e.KCPUpgradeSpecInput {
+			return capi_e2e.KCPUpgradeSpecInput{
+				E2EConfig:                e2eConfig,
+				ClusterctlConfigPath:     clusterctlConfigPath,
+				BootstrapClusterProxy:    bootstrapClusterProxy,
+				ArtifactFolder:           artifactFolder,
+				ControlPlaneMachineCount: 3,
+				SkipCleanup:              skipCleanup,
+				Flavor:                   "kcp-scale-in",
+			}
+		})
+	})
+
 	Context("Running the MachineDeployment upgrade spec", func() {
 		capi_e2e.MachineDeploymentUpgradesSpec(context.TODO(), func() capi_e2e.MachineDeploymentUpgradesSpecInput {
 			return capi_e2e.MachineDeploymentUpgradesSpecInput{
@@ -126,7 +139,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.KCPAdoptionSpecInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
@@ -138,7 +151,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.MachinePoolInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
@@ -150,7 +163,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.MachineDeploymentScaleSpecInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
@@ -162,7 +175,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.NodeDrainTimeoutSpecInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}

diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -68,6 +68,8 @@ providers:
       targetName: "cluster-template-kcp-remediation.yaml"
     - sourcePath: "../data/infrastructure-azure/v1alpha4/cluster-template-kcp-scale-in.yaml"
       targetName: "cluster-template-kcp-scale-in.yaml"
+    - sourcePath: "../data/infrastructure-azure/v1alpha4/cluster-template-node-drain.yaml"
+      targetName: "cluster-template-node-drain.yaml"
     - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-machine-pool.yaml"
       targetName: "cluster-template-machine-pool.yaml"
     - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml"
@@ -115,6 +117,7 @@ intervals:
   default/wait-machine-upgrade: ["60m", "10s"]
   default/wait-machine-remediation: ["30m", "10s"]
   default/wait-deployment: ["15m", "10s"]
+  default/wait-deployment-available: ["15m", "10s"]
   default/wait-job: ["5m", "10s"]
   default/wait-service: ["5m", "10s"]
   default/wait-machine-pool-nodes: ["30m", "10s"]