From 88fbb8375a449f75f7c2de6893788999bd6c8492 Mon Sep 17 00:00:00 2001 From: Sheetal Pamecha Date: Mon, 9 Dec 2024 02:01:21 +0530 Subject: [PATCH] e2e: enabled cephfs discovered For discovered apps, we want user to perform the cleanup of the workload. We should advertise the progression to them at the same time when we ask OCM/ACM to perform the cleanup. Signed-off-by: Sheetal Pamecha --- e2e/deployers/discoveredapps.go | 2 +- e2e/dractions/actionsdiscoveredapps.go | 4 ++-- e2e/dractions/retry.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/deployers/discoveredapps.go b/e2e/deployers/discoveredapps.go index 1b2e1deb3..aebdc5c33 100644 --- a/e2e/deployers/discoveredapps.go +++ b/e2e/deployers/discoveredapps.go @@ -115,5 +115,5 @@ func (d DiscoveredApps) Undeploy(ctx types.Context) error { } func (d DiscoveredApps) IsWorkloadSupported(w types.Workload) bool { - return w.GetName() != "Deploy-cephfs" + return true } diff --git a/e2e/dractions/actionsdiscoveredapps.go b/e2e/dractions/actionsdiscoveredapps.go index b515b8148..7f5ca21a6 100644 --- a/e2e/dractions/actionsdiscoveredapps.go +++ b/e2e/dractions/actionsdiscoveredapps.go @@ -131,7 +131,7 @@ func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction) er return err } - if err := waitDRPCProgression(ctx, client, namespace, name, ramen.ProgressionWaitOnUserToCleanUp); err != nil { + if err := waitDRPCProgression(ctx, client, namespace, name, ramen.ProgressionWaitOnUserToCleanUp, true); err != nil { return err } @@ -142,7 +142,7 @@ func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction) er return err } - if err = waitDRPCProgression(ctx, client, namespace, name, ramen.ProgressionCompleted); err != nil { + if err = waitDRPCProgression(ctx, client, namespace, name, ramen.ProgressionCompleted, false); err != nil { return err } diff --git a/e2e/dractions/retry.go b/e2e/dractions/retry.go index 1c062059e..705555665 100644 --- a/e2e/dractions/retry.go +++ b/e2e/dractions/retry.go @@ -200,7 +200,7 @@ func waitDRPCProgression( ctx types.Context, client client.Client, namespace, name string, - progression ramen.ProgressionStatus, + progression ramen.ProgressionStatus, consistently bool ) error { log := ctx.Logger() startTime := time.Now()