Merge pull request #8544 from blackpiglet/migration_init_release_1.15

Modify the Init logic to fix the migration case error.
2026-07-30 03:52:42 +00:00 · 2024-12-23 12:52:50 +08:00
parent b661ed7430 68e381d288
commit 5ca1d184e1
1 changed files with 5 additions and 5 deletions
@@ -67,8 +67,12 @@ func MigrationWithFS() {
 }

 func (m *migrationE2E) Init() error {
+	By("Call the base E2E init", func() {
+		Expect(m.TestCase.Init()).To(Succeed())
+	})
+
 	By("Skip check", func() {
-		if m.VeleroCfg.DefaultClusterContext == "" && m.VeleroCfg.StandbyClusterContext == "" {
+		if m.VeleroCfg.DefaultClusterContext == "" || m.VeleroCfg.StandbyClusterContext == "" {
 			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.ExpectedNodes = 3
 	m.CaseBaseName = "migration-" + m.UUIDgen