Merge branch 'drybjed-update-gitlab-version'

debops · Sep 4, 2019 · 7a79b16 · 7a79b16
2 parents bd16c14 + d68b80e
commit 7a79b16
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -45,6 +45,13 @@ General
 Changed
 ~~~~~~~
 
+Updates of upstream application versions
+''''''''''''''''''''''''''''''''''''''''
+
+- In the :ref:`debops.gitlab` role, GitLab version has been updated to
+  ``12.1``. This is the last release that supports Ruby 2.5 which is included
+  in Debian Buster.
+
 :ref:`debops.resolvconf` role
 '''''''''''''''''''''''''''''
 

diff --git a/ansible/roles/debops.gitlab/defaults/main.yml b/ansible/roles/debops.gitlab/defaults/main.yml
@@ -38,8 +38,13 @@ gitlab__release_map:
   'stretch': '10-8-stable'
   'xenial':  '10-8-stable'
 
-  'buster':  '11-10-stable'
-  'bionic':  '11-10-stable'
+  # OS releases with Ruby 2.5
+  'buster':  '12-1-stable'
+  'bionic':  '12-1-stable'
+
+  # OS releases with Ruby 2.6+ (future)
+  'bullseye': '12-1-stable'
+  'eoan':     '12-1-stable'
 
                                                                    # ]]]
 # .. envvar:: gitlab__distribution_release [[[

diff --git a/ansible/roles/debops.gitlab/meta/watch-gitlab b/ansible/roles/debops.gitlab/meta/watch-gitlab
@@ -1,6 +1,6 @@
 # Role: debops.gitlab
 # Package: gitlab
-# Version: 11-10-stable
+# Version: 12-1-stable
 
 version=3
 https://gitlab.com/gitlab-org/gitlab-ce/branches/active?utf8=%E2%9C%93&search=stable \