DLPX-94695 "ORACLE_UPGRADE_MINIMUM_UPGRADE_VERSION_TO_RELEASE_SOLARIS_11_4" fails while verifying VDB/dSource state after Upgrade. (#829)

prakashsurya · web-flow · commit 27e6883a596d · 2025-07-09T15:26:25.000-04:00
PR URL: https://www.github.com/delphix/appliance-build/pull/829
diff --git a/upgrade/upgrade-scripts/rootfs-container b/upgrade/upgrade-scripts/rootfs-container
@@ -264,14 +264,14 @@ function quiesce_sources_if_needed() {
 	# quiesce sources. Only upgrades going to 2025.4.0.0 or greater need
 	# this hack to quiesce sources.
 	#
-	compare_versions "$UPGRADE_VERSION" lt "2025.4.0.0-0" || return 0
+	compare_versions "$UPGRADE_VERSION" lt "2025.4.0.0-0" && return 0
 
 	#
 	# Also, if the version we're coming from is 2025.3.0.1 or greater, then
 	# don't quiesce sources. All versions 2025.3.0.1 and greater, should
 	# quiesce sources properly from the stack's upgrade logic.
 	#
-	compare_versions "$UPGRADE_BASE_VERSION" ge "2025.3.0.1-0" || return 0
+	compare_versions "$UPGRADE_BASE_VERSION" ge "2025.3.0.1-0" && return 0
 
 	#
 	# At this point, we know we're:

Original file line number	Diff line number	Diff line change
`@@ -264,14 +264,14 @@ function quiesce_sources_if_needed() {`
`264`	`264`	`# quiesce sources. Only upgrades going to 2025.4.0.0 or greater need`
`265`	`265`	`# this hack to quiesce sources.`
`266`	`266`	`#`
`267`		`- compare_versions "$UPGRADE_VERSION" lt "2025.4.0.0-0" \|\| return 0`
	`267`	`+ compare_versions "$UPGRADE_VERSION" lt "2025.4.0.0-0" && return 0`
`268`	`268`
`269`	`269`	`#`
`270`	`270`	`# Also, if the version we're coming from is 2025.3.0.1 or greater, then`
`271`	`271`	`# don't quiesce sources. All versions 2025.3.0.1 and greater, should`
`272`	`272`	`# quiesce sources properly from the stack's upgrade logic.`
`273`	`273`	`#`
`274`		`- compare_versions "$UPGRADE_BASE_VERSION" ge "2025.3.0.1-0" \|\| return 0`
	`274`	`+ compare_versions "$UPGRADE_BASE_VERSION" ge "2025.3.0.1-0" && return 0`
`275`	`275`
`276`	`276`	`#`
`277`	`277`	`# At this point, we know we're:`