Skip to content

Commit

Permalink
e2e: enabled cephfs discovered (#26)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Sheetalpamecha authored Dec 8, 2024
1 parent 8f74ebc commit 6a28ac6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion e2e/deployers/discoveredapps.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
5 changes: 3 additions & 2 deletions e2e/dractions/actionsdiscoveredapps.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/dractions/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func waitDRPCProgression(
ctx types.Context,
client client.Client,
namespace, name string,
progression ramen.ProgressionStatus,
progression ramen.ProgressionStatus, consistently bool

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Golangci Lint (e2e)

missing ',' before newline in parameter list (typecheck)

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Unit tests

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Unit tests

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Unit tests

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Unit tests

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Unit tests

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Check artifacts and operator deployment (1.29.1)

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Check artifacts and operator deployment (1.29.1)

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Check artifacts and operator deployment (1.29.1)

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Check artifacts and operator deployment (1.29.1)

missing ',' before newline in parameter list

Check failure on line 172 in e2e/dractions/retry.go

View workflow job for this annotation

GitHub Actions / Check artifacts and operator deployment (1.29.1)

missing ',' before newline in parameter list
) error {
log := ctx.Logger()
startTime := time.Now()
Expand Down

0 comments on commit 6a28ac6

Please sign in to comment.