From 705154d5c437796b821691b707156e1b056d244f Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <mr.felixoid@gmail.com>
Date: Wed, 19 Dec 2018 17:28:17 +0100
Subject: [PATCH] Fix rubygems-update for ruby older than 2.3

---
 config_defaults.yml           | 3 ++-
 moduleroot/.gitlab-ci.yml.erb | 5 ++++-
 moduleroot/.travis.yml.erb    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config_defaults.yml b/config_defaults.yml
index bc1e496e..90615c6f 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -68,7 +68,7 @@
     - env: CHECK=parallel_spec
     - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.4
-    - env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
+    - env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8
       rvm: 2.1.9
   deploy: true
   user: 'puppet'
@@ -594,6 +594,7 @@ Gemfile:
         checks:
           - parallel_spec
         puppet_version: '~> 4.0'
+        rubygems_version: '2.7.8'
       '2.4.4':
         checks:
           - 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
diff --git a/moduleroot/.gitlab-ci.yml.erb b/moduleroot/.gitlab-ci.yml.erb
index 452bdb5e..1dea95c3 100644
--- a/moduleroot/.gitlab-ci.yml.erb
+++ b/moduleroot/.gitlab-ci.yml.erb
@@ -44,7 +44,7 @@ before_script:
   - bundle config mirror.http://rubygems.org/ <%= configs['rubygems_mirror'] %>
   - bundle config mirror.https://rubygems.org/ <%= configs['rubygems_mirror'] %>
 <% end -%>
-  - gem update --system
+  - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
   - bundle install <%= configs['bundler_args'] %>
@@ -68,6 +68,9 @@ before_script:
     - bundle exec rake <%= check %>
   variables:
     PUPPET_GEM_VERSION: '<%= options['puppet_version'] %>'
+<%       if options['rubygems_version'] -%>
+    RUBYGEMS_VERSION: '<%= options['rubygems_version'] -%>'
+<%       end -%>
 <%       if options['allow_failure'] -%>
 <%         if options['allow_failure'].include?(check) -%>
   allow_failure: true
diff --git a/moduleroot/.travis.yml.erb b/moduleroot/.travis.yml.erb
index b60b5836..f019801c 100644
--- a/moduleroot/.travis.yml.erb
+++ b/moduleroot/.travis.yml.erb
@@ -19,7 +19,7 @@ addons:
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system
+  - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 script: