vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8544 from blackpiglet/migration_init_release_1.15 

Modify the Init logic to fix the migration case error.
pull/8545/head
Daniel Jiang 2024-12-23 12:52:50 +08:00 committed by GitHub
parent b661ed7430 68e381d288
commit 5ca1d184e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/migration/migration.go
View File

@ -67,8 +67,12 @@ func MigrationWithFS() {
} }
func (m *migrationE2E) Init() error { func (m *migrationE2E) Init() error {
By("Call the base E2E init", func() {
Expect(m.TestCase.Init()).To(Succeed())
})
By("Skip check", func() { By("Skip check", func() {
if m.VeleroCfg.DefaultClusterContext == "" && m.VeleroCfg.StandbyClusterContext == "" { if m.VeleroCfg.DefaultClusterContext == "" || m.VeleroCfg.StandbyClusterContext == "" {
Skip("Migration test needs 2 clusters") Skip("Migration test needs 2 clusters")
} }
@ -81,10 +85,6 @@ func (m *migrationE2E) Init() error {
} }
}) })
By("Call the base E2E init", func() {
Expect(m.TestCase.Init()).To(Succeed())
})
m.kibishiiData = *kibishii.DefaultKibishiiData m.kibishiiData = *kibishii.DefaultKibishiiData
m.kibishiiData.ExpectedNodes = 3 m.kibishiiData.ExpectedNodes = 3
m.CaseBaseName = "migration-" + m.UUIDgen m.CaseBaseName = "migration-" + m.UUIDgen