Merge pull request #127608 from cockroachdb/blathers/backport-release…

…-23.2.9-rc-127375
cockroachdb · Jul 22, 2024 · 579c0a0 · 579c0a0
2 parents c0e26e3 + 7fb249a
commit 579c0a0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go b/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go
@@ -737,8 +737,10 @@ func (t *Test) choosePreviousReleases() ([]*clusterupgrade.Version, error) {
 		}
 
 		// If skip-version upgrades are not enabled, the only possible
-		// predecessor is the immediate predecessor release.
-		if !skipVersions {
+		// predecessor is the immediate predecessor release. If the
+		// predecessor doesn't support skip versions, then its predecessor
+		// won't either. Don't attempt to find it.
+		if !skipVersions || !pred.AtLeast(minSupportedSkipVersionUpgrade) {
 			return []*clusterupgrade.Version{pred}, nil
 		}