Skip to content

Makes 14.9 a required upgrade before moving to 14.10

DJ Mountney requested to merge make-14.9-required into 5-10-stable

What does this MR do?

Ensures that users jump to 14.9 prior to moving to 14.10. Otherwise they will always get a migration failure as 14.10 is depending on a background migration introduced in 14.9.

Related issues

Part of gitlab-org/omnibus-gitlab#6864 (closed) Related to gitlab-org/gitlab!83918 (closed)

Test Plan

As these checks only apply to tagged releases, you need to patch your local install to make it look like 14.10 to the check:

diff --git a/Chart.yaml b/Chart.yaml
index 0ae7cb5ad..e9149b9f9 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: gitlab
-version: 5.9.2
+version: 5.10.0
 appVersion: master
 description: Web-based Git-repository manager with wiki and issue-tracking features.
 keywords:
diff --git a/templates/upgrade_check_hook.yaml b/templates/upgrade_check_hook.yaml
index fb76e9148..fecfea47e 100644
--- a/templates/upgrade_check_hook.yaml
+++ b/templates/upgrade_check_hook.yaml
@@ -57,7 +57,7 @@ spec:
           {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }}
           env:
             - name: GITLAB_VERSION
-              value: '{{ coalesce .Values.global.gitlabVersion .Chart.AppVersion }}'
+              value: '14.10.0'
             - name: CHART_VERSION
               value: '{{ .Chart.Version }}'
           volumeMounts:
  1. Test fresh install of this branch
  2. Run a second upgrade install of the same branch to see that upgrade is not blocked on new version
  3. Install 14.8 and upgrade to this branch, and see the upgrade step fail
  4. Install 14.9 and upgrade to this branch, all should pass

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Mitchell Nielsen

Merge request reports