diff --git a/test/e2e/backups/deletion.go b/test/e2e/backups/deletion.go index bd5d33919..91f406107 100644 --- a/test/e2e/backups/deletion.go +++ b/test/e2e/backups/deletion.go @@ -295,7 +295,7 @@ func runBackupDeletionTests(client TestClient, veleroCfg VeleroConfig, backupLoc veleroCfg.BSLConfig, backupName, BackupObjectsPrefix, - 1, + 5, ); err != nil { return err } diff --git a/test/e2e/backups/sync_backups.go b/test/e2e/backups/sync_backups.go index cbbba10c1..bf6b239cc 100644 --- a/test/e2e/backups/sync_backups.go +++ b/test/e2e/backups/sync_backups.go @@ -162,7 +162,7 @@ func BackupsSyncTest() { By(fmt.Sprintf("Check %s backup files in object store is deleted", test.backupName), func() { err = ObjectsShouldNotBeInBucket(veleroCfg.ObjectStoreProvider, veleroCfg.CloudCredentialsFile, veleroCfg.BSLBucket, - veleroCfg.BSLPrefix, veleroCfg.BSLConfig, test.backupName, BackupObjectsPrefix, 1) + veleroCfg.BSLPrefix, veleroCfg.BSLConfig, test.backupName, BackupObjectsPrefix, 5) Expect(err).To(Succeed(), fmt.Sprintf("Failed to delete object in bucket %s with err %v", test.backupName, err)) }) diff --git a/test/util/providers/aws_utils.go b/test/util/providers/aws_utils.go index d342720e3..2f2d7ed00 100644 --- a/test/util/providers/aws_utils.go +++ b/test/util/providers/aws_utils.go @@ -197,7 +197,7 @@ func (s AWSStorage) IsObjectsInBucket(cloudCredentialsFile, bslBucket, bslPrefix return false, errors.Wrapf(err, "failed to get region for bucket %s", bslBucket) } } - if region == "minio" { + if region == "minio" || region == "seaweedfs" { s3url = config.Data()["s3Url"] s3Config, err = newAWSConfig(region, "", cloudCredentialsFile, true, "") if err != nil { @@ -255,7 +255,7 @@ func (s AWSStorage) DeleteObjectsInBucket(cloudCredentialsFile, bslBucket, bslPr } } - if region == "minio" { + if region == "minio" || region == "seaweedfs" { s3url = config.Data()["s3Url"] s3Config, err = newAWSConfig(region, "", cloudCredentialsFile, true, "") if err != nil { @@ -306,7 +306,7 @@ func (s AWSStorage) IsSnapshotExisted(cloudCredentialsFile, bslConfig, backupObj config.Set(bslConfig) region := config.Data()["region"] - if region == "minio" { + if region == "minio" || region == "seaweedfs" { return errors.New("No snapshot for Minio provider") } @@ -439,7 +439,7 @@ func (s AWSStorage) GetObject(cloudCredentialsFile, bslBucket, bslPrefix, bslCon return nil, errors.Wrapf(err, "failed to get region for bucket %s", bslBucket) } } - if region == "minio" { + if region == "minio" || region == "seaweedfs" { s3url = config.Data()["s3Url"] s3Config, err = newAWSConfig(region, "", cloudCredentialsFile, true, "") if err != nil {