Fix Puppet CI (#784)

* Pin semantic-puppet version in kitchen tests

* Create Gemfile and use bundle to isntall r10k

* Add puppet 7.14 and 7.9 tests back

Author: KevinFairise2

.circleci/config.yml

@@ -240,7 +240,6 @@ jobs:
       STRICT_VARIABLES: 'yes'
       RUBY_VERSION: '2.6.3'
       PUPPET_VERSION: '6.5.0'
-
   specs-ruby26-puppet79:
     <<: *specs
     environment:
@@ -255,6 +254,13 @@ jobs:
       RUBY_VERSION: '2.6.3'
       PUPPET_VERSION: '7.14.0'
 
+  specs-ruby26-puppet725:
+    <<: *specs
+    environment:
+      STRICT_VARIABLES: 'yes'
+      RUBY_VERSION: '2.6.3'
+      PUPPET_VERSION: '7.25.0'
+
   specs-ruby25-puppet65-windows: &windows-specs
     executor:
       name: win/default # Comes with ruby 2.6, which is not supported on Windows as of puppet 6.10.1
@@ -366,5 +372,6 @@ workflows:
       - specs-ruby26-puppet65
       - specs-ruby26-puppet79
       - specs-ruby26-puppet714
+      - specs-ruby26-puppet725
       - verify-gemfile-lock-dependencies
       - kitchen-tests

.fixtures.yml

@@ -14,8 +14,12 @@ fixtures:
       ref: "1.0.0"
     ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
   forge_modules:
-    yumrepo_core: "puppetlabs/yumrepo_core"
-    powershell: "puppetlabs/powershell"
+    yumrepo_core:
+      repo: "puppetlabs/yumrepo_core"
+      ref: "1.2.0"
+    powershell:
+      repo: "puppetlabs/powershell"
+      ref: "4.1.0"
     zypprepo:
       repo: "puppet/zypprepo"
       ref: "3.1.0"

Gemfile

@@ -5,14 +5,16 @@ ruby_version = Gem::Version.new(RUBY_VERSION.dup)
 # Each version of Puppet recommends a specific version of Ruby. Try to fetch the Puppet version that
 # matches our Ruby (unless PUPPET_VERSION is defined).
 matching_puppet_version = ruby_version > Gem::Version.new('2.5') ? (ruby_version > Gem::Version.new('2.7') ? '7.0.0' : '6.0.1') : '4.10.2'
-gem "puppet", "~> #{ENV.fetch('PUPPET_VERSION', matching_puppet_version)}"
+puppet_version = ENV.fetch('PUPPET_VERSION', matching_puppet_version)
+gem "puppet", "~> #{puppet_version}"
 
 ruby_version_segments = ruby_version.segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
   gem "rake", "~> 12.3.3"                                          if ruby_version < Gem::Version.new('2.6.0') # last version for ruby < 2.6
   gem "xmlrpc"                                                     if ruby_version >= Gem::Version.new('2.3')
+  gem "concurrent-ruby", '= 1.1.10'                                if Gem::Requirement.create([' >= 6.9.0', '<7.25.0']).satisfied_by?(Gem::Version.new(puppet_version)) # Add this beucause until Puppet 7.25 concurrent-ruby 1.22 break puppet
   gem "ruby-pwsh", '~> 0.3.0',                                     platforms: [:mswin, :mingw, :x64_mingw]
   gem "fast_gettext", '1.1.0',                                     require: false if ruby_version < Gem::Version.new('2.1.0')
   gem "fast_gettext",                                              require: false if ruby_version >= Gem::Version.new('2.1.0')

environments/etc/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'semantic_puppet', '1.0.4' 
+gem 'multipart-post', '2.1.1'
+gem 'r10k', '2.6.7'

kitchen.yml

@@ -27,10 +27,11 @@ platforms:
 
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
+        - printf <%= File.read('environments/etc/Gemfile').inspect %> > /home/Gemfile
 
         - gem install bundler -v '= 1.17.3'
-        # multipart-post 2.2.0 breaks r10k 2.6.7, so lock it at 2.1.1 (we can't upgrade r10k because of old Ruby)
-        - gem install multipart-post:2.1.1 r10k:2.6.7
+        # we use bundle to install gems and to lock dependencies versions of semantic_puppet and multipart-post
+        - cd /home && bundle install
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
   - name: rocky-8-puppet-5
@@ -47,9 +48,11 @@ platforms:
 
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
+        - printf <%= File.read('environments/etc/Gemfile').inspect %> > /home/Gemfile
 
         - gem install bundler -v '= 1.17.3'
-        - gem install multipart-post:2.1.1 r10k:2.6.7
+
+        - cd /home && bundle install
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
   - name: ubuntu-1604-puppet-6
@@ -67,9 +70,10 @@ platforms:
 
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
+        - printf <%= File.read('environments/etc/Gemfile').inspect %> > /home/Gemfile
 
         - gem install bundler -v '= 1.17.3'
-        - gem install multipart-post:2.1.1 r10k:2.6.7
+        - cd /home && bundle install
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
   - name: opensuse/leap-15
@@ -93,9 +97,10 @@ platforms:
         - ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
+        - printf <%= File.read('environments/etc/Gemfile').inspect %> > /home/Gemfile
 
-        - /opt/puppetlabs/puppet/bin/gem install multipart-post:2.1.1 r10k:2.6.7
-        - cd /home/kitchen/puppet && /opt/puppetlabs/puppet/bin/r10k puppetfile install --moduledir=/tmp/modules
+        - cd /home && bundle.ruby2.5 install
+        - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
 verifier:
   name: serverspec