Merge pull request #765 from Nordix/Add-cleaning-to-upgrade-test/mohammed

🌱 Add Precleaning hook to upgrade test

Author: metal3-io-bot

test/e2e/pivoting_test.go

@@ -214,7 +214,7 @@ func removeIronicDeployment() {
 	Expect(err).To(BeNil(), "Failed to delete Ironic from the source cluster")
 }
 
-func removeIronicDeploymentOnTarget() {
+func removeIronicDeploymentOnTarget(targetCluster framework.ClusterProxy) {
 	deploymentName := e2eConfig.GetVariable("NAMEPREFIX") + "-ironic"
 	ironicNamespace := e2eConfig.GetVariable("IRONIC_NAMESPACE")
 	err := targetCluster.GetClientSet().AppsV1().Deployments(ironicNamespace).Delete(ctx, deploymentName, metav1.DeleteOptions{})
@@ -270,7 +270,7 @@ func labelHDCRDs(targetCluster framework.ClusterProxy) {
 func rePivoting() {
 	Logf("Start the re-pivoting test")
 	By("Remove Ironic deployment from target cluster")
-	removeIronicDeploymentOnTarget()
+	removeIronicDeploymentOnTarget(targetCluster)
 
 	By("Reinstate Ironic containers and BMH")
 	ephemeralCluster := os.Getenv("EPHEMERAL_CLUSTER")

test/e2e/upgrade_management_cluster_test.go

@@ -26,18 +26,19 @@ var _ = Describe("When testing cluster upgrade v1alpha5 > current [upgrade]", fu
 	})
 	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 		return capi_e2e.ClusterctlUpgradeSpecInput{
-			E2EConfig:                 e2eConfig,
-			ClusterctlConfigPath:      clusterctlConfigPath,
-			BootstrapClusterProxy:     bootstrapClusterProxy,
-			ArtifactFolder:            artifactFolder,
-			SkipCleanup:               true, // TODO(mboukhalfa): Parameterize after merging https://github.com/kubernetes-sigs/cluster-api/pull/7373
-			InitWithProvidersContract: "v1alpha4",
-			InitWithBinary:            e2eConfig.GetVariable("INIT_WITH_BINARY"),
-			PreInit:                   preInitFunc,
-			PreWaitForCluster:         preWaitForCluster,
-			PreUpgrade:                preUpgrade,
-			MgmtFlavor:                osType,
-			WorkloadFlavor:            osType,
+			E2EConfig:                   e2eConfig,
+			ClusterctlConfigPath:        clusterctlConfigPath,
+			BootstrapClusterProxy:       bootstrapClusterProxy,
+			ArtifactFolder:              artifactFolder,
+			SkipCleanup:                 skipCleanup,
+			InitWithProvidersContract:   "v1alpha4",
+			InitWithBinary:              e2eConfig.GetVariable("INIT_WITH_BINARY"),
+			PreInit:                     preInitFunc,
+			PreWaitForCluster:           preWaitForCluster,
+			PreUpgrade:                  preUpgrade,
+			PreCleanupManagementCluster: preCleanupManagementCluster,
+			MgmtFlavor:                  osType,
+			WorkloadFlavor:              osType,
 		}
 	})
 })
@@ -152,3 +153,27 @@ func preUpgrade(clusterProxy framework.ClusterProxy) {
 	upgradeIronic(clusterProxy.GetClientSet())
 	upgradeBMO(clusterProxy.GetClientSet())
 }
+
+// preCleanupManagementCluster hook should be called from ClusterctlUpgradeSpec before cleaning the target management cluster
+// it moves back Ironic to the bootstrap cluster.
+func preCleanupManagementCluster(clusterProxy framework.ClusterProxy) {
+	// Reinstall ironic
+	reInstallIronic := func() {
+		By("Reinstate Ironic containers and BMH")
+		ephemeralCluster := os.Getenv("EPHEMERAL_CLUSTER")
+		if ephemeralCluster == KIND {
+			By("Install Ironic in the source cluster as containers")
+			bmoPath := e2eConfig.GetVariable("BMOPATH")
+			ironicCommand := bmoPath + "/tools/run_local_ironic.sh"
+			cmd := exec.Command("sh", "-c", "export CONTAINER_RUNTIME=docker; "+ironicCommand)
+			stdoutStderr, err := cmd.CombinedOutput()
+			fmt.Printf("%s\n", stdoutStderr)
+			Expect(err).To(BeNil(), "Cannot run local ironic")
+		} else {
+			By("Install Ironic in the source cluster as deployments")
+			installIronicBMO(bootstrapClusterProxy, "true", "false")
+		}
+	}
+	removeIronicDeploymentOnTarget(clusterProxy)
+	reInstallIronic()
+}