Use IRSO in e2e tests

Signed-off-by: Muhammad Adil Ghaffar <[email protected]>

Author: adilGhaffarDev

scripts/ci-e2e.sh

@@ -184,6 +184,8 @@ update_kustomize_image quay.io/metal3-io/ironic IRONIC_IMAGE "${REPO_ROOT}"/test
 # Apply envsubst to kustomization.yaml files in BMO and Ironic overlays
 kustomize_envsubst "${REPO_ROOT}"/test/e2e/data/bmo-deployment/overlays/pr-test
 kustomize_envsubst "${REPO_ROOT}"/test/e2e/data/ironic-deployment/overlays/pr-test
+kustomize_envsubst "${REPO_ROOT}"/test/e2e/data/ironic-standalone-operator/operator
+kustomize_envsubst "${REPO_ROOT}"/test/e2e/data/ironic-standalone-operator/ironic
 
 # Create usernames and passwords and other files related to ironi basic auth if they
 # are missing

test/e2e/config/e2e_conf.yaml

@@ -235,6 +235,11 @@ variables:
   IRONIC_RELEASE_29.0: "data/ironic-deployment/overlays/release-29.0"
   IRONIC_RELEASE_PR_TEST: "data/ironic-deployment/overlays/pr-test"
   IRONIC_RELEASE_LATEST: "data/ironic-deployment/overlays/release-latest"
+  IRSO_OPERATOR_LATEST: "data/ironic-standalone-operator/operator"
+  IRSO_IRONIC_26.0: "data/ironic-standalone-operator/ironic/overlays/release-26.0"
+  IRSO_IRONIC_27.0: "data/ironic-standalone-operator/ironic/overlays/release-27.0"
+  IRSO_IRONIC_29.0: "data/ironic-standalone-operator/ironic/overlays/release-29.0"
+  IRSO_IRONIC_MAIN: "data/ironic-standalone-operator/ironic/overlays/release-main"
   BMO_RELEASE_0.8: "data/bmo-deployment/overlays/release-0.8"
   BMO_RELEASE_0.9: "data/bmo-deployment/overlays/release-0.9"
   BMO_RELEASE_0.10: "data/bmo-deployment/overlays/release-0.10"

test/e2e/pivoting.go

@@ -152,18 +152,17 @@ func pivoting(ctx context.Context, inputGetter func() PivotingInput) {
 	By("Add Labels to hardwareData CRDs")
 	labelHDCRDs(ctx, input.BootstrapClusterProxy)
 
-	By("Install Ironic in the target cluster")
-	// TODO(dtantsur): support ironic-standalone-operator
+	By("Install Ironic Standalone Operator in the target cluster")
 	ironicDeployLogFolder := filepath.Join(os.TempDir(), "target_cluster_logs", "ironic-deploy-logs", input.TargetCluster.GetName())
-	ironicKustomization := input.E2EConfig.MustGetVariable("IRONIC_RELEASE_PR_TEST")
+	ironicKustomization := input.E2EConfig.MustGetVariable("IRSO_OPERATOR_LATEST")
 	By(fmt.Sprintf("Installing Ironic from kustomization %s on the target cluster", ironicKustomization))
 	err = BuildAndApplyKustomization(ctx, &BuildAndApplyKustomizationInput{
 		Kustomization:       ironicKustomization,
 		ClusterProxy:        input.TargetCluster,
 		WaitForDeployment:   true,
 		WatchDeploymentLogs: true,
 		LogPath:             ironicDeployLogFolder,
-		DeploymentName:      "baremetal-operator-ironic",
+		DeploymentName:      "ironic-stanalone-operator",
 		DeploymentNamespace: ironicNamespaceObj.Name,
 		WaitIntervals:       input.E2EConfig.GetIntervals("default", "wait-deployment"),
 	})