.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
       puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
     env:
-      BUNDLE_WITHOUT: development:release
+      BUNDLE_WITHOUT: development:system_tests:release
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [7.1.0](https://github.com/theforeman/puppet-git/tree/7.1.0) (2022-02-03)
+
+[Full Changelog](https://github.com/theforeman/puppet-git/compare/7.0.0...7.1.0)
+
+**Implemented enhancements:**
+
+- Support Debian 11 and Ubuntu 20.04 [\#84](https://github.com/theforeman/puppet-git/pull/84) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Pin rdoc to \< 6.4 [\#83](https://github.com/theforeman/puppet-git/pull/83) ([ekohl](https://github.com/ekohl))
+
 ## [7.0.0](https://github.com/theforeman/puppet-git/tree/7.0.0) (2021-07-22)
 
 [Full Changelog](https://github.com/theforeman/puppet-git/compare/6.3.0...7.0.0)

Gemfile

@@ -13,10 +13,14 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
 gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
 gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 1.4'
+gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 0.3'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 0.3', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
+gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
+
+# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)
+gem 'rdoc', '< 6.4'
 
 # vim:ft=ruby

Rakefile

@@ -1,10 +1,26 @@
 # This file is managed centrally by modulesync
 #   https://github.com/theforeman/foreman-installer-modulesync
 
-require 'voxpupuli/test/rake'
+# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
+# otherwise attempt to load it directly.
+begin
+  require 'voxpupuli/test/rake'
+rescue LoadError
+  begin
+    require 'puppetlabs_spec_helper/rake_tasks'
+  rescue LoadError
+  end
+end
 
-# We use fixtures in our modules, which is not the default
-task :beaker => 'spec_prep'
+# load optional tasks for acceptance
+# only available if gem group releases is installed
+begin
+  require 'voxpupuli/acceptance/rake'
+rescue LoadError
+else
+  # We use fixtures in our modules, which is not the default
+  task :beaker => 'spec_prep'
+end
 
 # blacksmith isn't always present, e.g. on Travis with --without development
 begin

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-git",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "author": "theforeman",
   "summary": "git installation and configuration",
   "license": "GPL-3.0+",
@@ -59,14 +59,16 @@
       "operatingsystemrelease": [
         "8",
         "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {

spec/classes/init_spec.rb

@@ -8,7 +8,7 @@
       end
 
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_package('git').with_ensure('present') }
+      it { is_expected.to contain_package('git').with_ensure('installed') }
     end
   end
 end

spec/spec_helper_acceptance.rb

@@ -12,31 +12,6 @@
     # refresh check if cache needs refresh on next yum command
     on host, 'yum clean expire-cache'
   end
-
-  local_setup = File.join(__dir__, 'setup_acceptance_node.pp')
-  if File.exist?(local_setup)
-    puts "Configuring #{host} by applying #{local_setup}"
-    apply_manifest_on(host, File.read(local_setup), catch_failures: true)
-  end
-end
-
-shared_examples 'a idempotent resource' do
-  it 'applies with no errors' do
-    apply_manifest(pp, catch_failures: true)
-  end
-
-  it 'applies a second time without changes' do
-    apply_manifest(pp, catch_changes: true)
-  end
-end
-
-shared_examples 'the example' do |name|
-  let(:pp) do
-    path = File.join(File.dirname(__dir__), 'examples', name)
-    File.read(path)
-  end
-
-  include_examples 'a idempotent resource'
 end
 
 Dir["./spec/support/acceptance/**/*.rb"].sort.each { |f| require f }