Skip to content
Snippets Groups Projects
Commit b39351133871 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'make-14-10-mandatory-upgrade-path' into 'master'

Make 14.10 minimum required version to upgrade to 15.0

Closes #6810

See merge request gitlab-org/omnibus-gitlab!6050
No related branches found
No related tags found
1 merge request!72Intermediate build for testing purposes
......@@ -40,7 +40,7 @@
upgrade_check() {
# Minimum version from which jumps are permitted to current version.
# Follows https://docs.gitlab.com/ee/update/index.html#upgrade-paths
MIN_VERSION=14.0
MIN_VERSION=14.10
if [ -n "${OLD_VERSION_STRING}" ] ; then
# Checking
......
......@@ -112,7 +112,7 @@
then
GITLAB_UPGRADE='true'
new_version=$(awk '/^gitlab-(ce|ee|jh)/ {print $NF}' /opt/gitlab/version-manifest.txt)
MIN_VERSION="14.0" gitlab-ctl upgrade-check "${old_version}" "${new_version}"
MIN_VERSION="14.10" gitlab-ctl upgrade-check "${old_version}" "${new_version}"
fi
# Copy gitlab.rb for the first time
......
module GitlabCtl
class UpgradeCheck
MIN_VERSION = ENV['MIN_VERSION'] || '14.0'.freeze
MIN_VERSION = ENV['MIN_VERSION'] || '14.10'.freeze
class <<self
def valid?(ov, nv)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment