Skip to content

Commit

Permalink
Add flake attempts to the flaky tests
Browse files Browse the repository at this point in the history
This adds attempts to the flaky tests, which are caused by two known
issues. First one isn't yet available in the CI cluster, second
is known and needs to be fixed in the Velero code:

 - kubernetes-csi/external-snapshotter#876
 - vmware-tanzu/velero#5856

Signed-off-by: Michal Pryc <[email protected]>
  • Loading branch information
mpryc committed Jan 23, 2024
1 parent 7ce66f1 commit a6520e5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/e2e/backup_restore_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,23 +264,23 @@ var _ = Describe("Backup and restore tests", func() {
func(brCase BackupRestoreCase, expectedErr error) {
runBackupAndRestore(brCase, expectedErr, updateLastBRcase, updateLastInstallTime)
},
Entry("MySQL application CSI", BackupRestoreCase{
Entry("MySQL application CSI", FlakeAttempts(3), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-csi.yaml",
ApplicationNamespace: "mysql-persistent",
Name: "mysql-csi-e2e",
BackupRestoreType: CSI,
PreBackupVerify: mysqlReady(true, false, CSI),
PostRestoreVerify: mysqlReady(false, false, CSI),
}, nil),
Entry("Mongo application CSI", BackupRestoreCase{
Entry("Mongo application CSI", FlakeAttempts(3), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mongo-persistent/mongo-persistent-csi.yaml",
ApplicationNamespace: "mongo-persistent",
Name: "mongo-csi-e2e",
BackupRestoreType: CSI,
PreBackupVerify: mongoready(true, false, CSI),
PostRestoreVerify: mongoready(false, false, CSI),
}, nil),
Entry("MySQL application two Vol CSI", BackupRestoreCase{
Entry("MySQL application two Vol CSI", FlakeAttempts(3), BackupRestoreCase{
ApplicationTemplate: fmt.Sprintf("./sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml"),
ApplicationNamespace: "mysql-persistent",
Name: "mysql-twovol-csi-e2e",
Expand Down Expand Up @@ -320,23 +320,23 @@ var _ = Describe("Backup and restore tests", func() {
PreBackupVerify: mysqlReady(true, false, KOPIA),
PostRestoreVerify: mysqlReady(false, false, KOPIA),
}, nil),
Entry("Mongo application DATAMOVER", BackupRestoreCase{
Entry("Mongo application DATAMOVER", FlakeAttempts(2), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mongo-persistent/mongo-persistent-csi.yaml",
ApplicationNamespace: "mongo-persistent",
Name: "mongo-datamover-e2e",
BackupRestoreType: CSIDataMover,
PreBackupVerify: mongoready(true, false, CSIDataMover),
PostRestoreVerify: mongoready(false, false, CSIDataMover),
}, nil),
Entry("MySQL application DATAMOVER", BackupRestoreCase{
Entry("MySQL application DATAMOVER", FlakeAttempts(2), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-csi.yaml",
ApplicationNamespace: "mysql-persistent",
Name: "mysql-datamover-e2e",
BackupRestoreType: CSIDataMover,
PreBackupVerify: mysqlReady(true, false, CSIDataMover),
PostRestoreVerify: mysqlReady(false, false, CSIDataMover),
}, nil),
Entry("Mongo application BlockDevice DATAMOVER", BackupRestoreCase{
Entry("Mongo application BlockDevice DATAMOVER", FlakeAttempts(2), BackupRestoreCase{
ApplicationTemplate: "./sample-applications/mongo-persistent/mongo-persistent-block.yaml",
PvcSuffixName: "-block-mode",
ApplicationNamespace: "mongo-persistent",
Expand Down

0 comments on commit a6520e5

Please sign in to comment.