Merge pull request #8551 from blackpiglet/migration_init

[cherry-pick] Modify the Init logic to fix the migration case error.
vmware-tanzu · Dec 24, 2024 · fa8f464 · fa8f464
2 parents 20a647b + 938dd3c
commit fa8f464
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go
@@ -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