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 af169e510..8c5ef748d 100644 --- a/e2e/dractions/actionsdiscoveredapps.go +++ b/e2e/dractions/actionsdiscoveredapps.go @@ -131,7 +131,7 @@ func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction, st 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,8 @@ func failoverRelocateDiscoveredApps(ctx types.Context, action ramen.DRAction, st return err } - if err := waitDRPCPhase(ctx, client, namespace, name, state); 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 d330297eb..fedb8b1fb 100644 --- a/e2e/dractions/retry.go +++ b/e2e/dractions/retry.go @@ -169,7 +169,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()