release: always set current version as min upgradeable version (#17446)

* release: always set current version as min upgradeable version * ci: bump MINIMUM_UPGRADEABLE_VERSION to 3.23.0
sourcegraph · Jan 20, 2021 · 74903f9 · 74903f9
1 parent 009acb0
commit 74903f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/dev/release/src/release.ts b/dev/release/src/release.ts
@@ -450,10 +450,8 @@ cc @${config.captainGitHubUsername}
                             `comby -in-place 'latestReleaseDockerServerImageBuild = newBuild(":[1]")' "latestReleaseDockerServerImageBuild = newBuild(\\"${release.version}\\")" cmd/frontend/internal/app/updatecheck/handler.go`,
                             `comby -in-place 'latestReleaseDockerComposeOrPureDocker = newBuild(":[1]")' "latestReleaseDockerComposeOrPureDocker = newBuild(\\"${release.version}\\")" cmd/frontend/internal/app/updatecheck/handler.go`,
 
-                            // Support previous release for now
-                            notPatchRelease
-                                ? `comby -in-place 'env["MINIMUM_UPGRADEABLE_VERSION"] = ":[1]"' 'env["MINIMUM_UPGRADEABLE_VERSION"] = "${previous.version}"' enterprise/dev/ci/ci/*.go`
-                                : 'echo "Skipping bumping of upgradable version for patch release"',
+                            // Support current release as the "previous release" going forward
+                            `comby -in-place 'env["MINIMUM_UPGRADEABLE_VERSION"] = ":[1]"' 'env["MINIMUM_UPGRADEABLE_VERSION"] = "${release.version}"' enterprise/dev/ci/ci/*.go`,
 
                             // Add a stub to add upgrade guide entries
                             notPatchRelease

diff --git a/enterprise/dev/ci/ci/pipeline-steps.go b/enterprise/dev/ci/ci/pipeline-steps.go
@@ -267,7 +267,7 @@ func triggerE2EandQA(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
 	env["VAGRANT_SERVICE_ACCOUNT"] = "buildkite@sourcegraph-ci.iam.gserviceaccount.com"
 
 	// Test upgrades from mininum upgradeable Sourcegraph version - updated by release tool
-	env["MINIMUM_UPGRADEABLE_VERSION"] = "3.22.0"
+	env["MINIMUM_UPGRADEABLE_VERSION"] = "3.23.0"
 
 	env["DOCKER_CLUSTER_IMAGES_TXT"] = clusterDockerImages(images.SourcegraphDockerImages)