Tests tets

cdapio · Feb 7, 2025 · f645b35 · f645b35
1 parent 691ff3f
commit f645b35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/spec.go b/controllers/spec.go
@@ -603,7 +603,7 @@ func newUpgradeJobSpec(master *v1alpha1.CDAPMaster, name string, labels map[stri
     s.SkipPreUpgradeFlag = false
   }
 	s.SkipPreUpgrade = false
-	
+
 	return s
 }
 
@@ -619,6 +619,6 @@ func (s *VersionUpgradeJobSpec) SetPostUpgrade(isPostUpgrade bool) *VersionUpgra
 
 func (s *VersionUpgradeJobSpec) SetSkipPreUpgrade(isPatchUpgrade bool) *VersionUpgradeJobSpec {
   // If it is a patch revision and the flag is true, skip the pre upgrade job
-	s.SkipPreUpgrade = isPatchUpgrade && s.SkipPreUpgradeFlag
+	s.SkipPreUpgrade = false
 	return s
 }
diff --git a/controllers/version_update_test.go b/controllers/version_update_test.go
@@ -214,7 +214,7 @@ var _ = Describe("Controller Suite", func() {
 					ImageToUse:             curUIImage,
 				},
 			}
-			postJobSpec := buildPreUpgradeJobSpec(getPreUpgradeJobName(master.Status.UpgradeStartTimeMillis), master, emptyLabels, true)
+			postJobSpec := buildPreUpgradeJobSpec(getPreUpgradeJobName(master.Status.UpgradeStartTimeMillis), master, emptyLabels, false)
 			object, err := buildUpgradeJobObject(postJobSpec)
 			Expect(err).To(BeNil())