simp-beaker-helpers 1.28.0 → 1.30.0

data/.rubocop.yml

@@ -13,7 +13,7 @@ AllCops:
     - Rakefile
     - Guardfile
     - Vagrantfile
-Lint/ConditionPosition:
+Layout/ConditionPosition:
   Enabled: True
 
 Lint/ElseLayout:
@@ -22,13 +22,13 @@ Lint/ElseLayout:
 Lint/UnreachableCode:
   Enabled: True
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: True
 
 Lint/EnsureReturn:
   Enabled: True
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: True
 
 Lint/LiteralAsCondition:
@@ -84,13 +84,13 @@ Lint/AmbiguousRegexpLiteral:
 Security/Eval:
   Enabled: True
 
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Enabled: True
 
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   Enabled: True
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: True
 
 Lint/DeprecatedClassMethods:
@@ -105,7 +105,7 @@ Lint/ParenthesesAsGroupedExpression:
 Lint/RescueException:
   Enabled: True
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Enabled: True
 
 Lint/UnusedBlockArgument:
@@ -132,13 +132,13 @@ Naming/AccessorMethodName:
 Style/Alias:
   Enabled: True
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Enabled: True
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: True
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: True
 
 Metrics/BlockNesting:
@@ -150,9 +150,6 @@ Style/AsciiComments:
 Style/Attr:
   Enabled: True
 
-Style/BracesAroundHashParameters:
-  Enabled: True
-
 Style/CaseEquality:
   Enabled: True
 
@@ -187,16 +184,16 @@ Style/WhenThen:
 Style/WordArray:
   Enabled: True
 
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: True
 
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: True
 
 Layout/SpaceBeforeSemicolon:
   Enabled: True
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: True
 
 Layout/SpaceInsideBlockBraces:
@@ -281,10 +278,10 @@ Style/EachWithObject:
 Layout/EmptyLineBetweenDefs:
   Enabled: True
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Enabled: True
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Enabled: True
 
 Layout/IndentationConsistency:
@@ -306,7 +303,7 @@ Style/EmptyLiteral:
 Layout/TrailingWhitespace:
   Enabled: True
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: False
 
 Naming/BinaryOperatorParameterName:
@@ -331,7 +328,10 @@ Style/StringLiterals:
 Style/TrailingCommaInArguments:
   Enabled: True
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: True
+
+Style/TrailingCommaInHashLiteral:
   Enabled: True
 
 Style/GlobalVars:
@@ -497,9 +497,6 @@ Metrics/AbcSize:
 Metrics/PerceivedComplexity:
   Enabled: False
 
-Lint/UselessAssignment:
-  Enabled: True
-
 Layout/ClosingParenthesisIndentation:
   Enabled: True
 
@@ -529,7 +526,7 @@ RSpec/NestedGroups:
   Enabled: False
 
 # this is broken on ruby1.9
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: False
 
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 1.30.0 / 2023-05-15
+* Added:
+  * Default `puppet_collection` to `puppet7`
+  * Support for new pulp-slimmed repo names in `install_simp_repos` logic
+  * Modernize GHA PR test matrix
+    * Support for experimental (Puppet 8.x/ruby 3.1)
+  * Add GHA acceptance test matrix (puppet version x suite)
+    * Support for experimental (Puppet 8.x/ruby 3.1)
+    * Allow problematic inspec suite to fail
+* Fixed:
+  * Update to `beaker-rspec` 8.x depsolve with `simp-rake-helpers` 5.20.0+
+  * Update `beaker` to permit 5.x
+  * Update default `puppet-agent` to 7.x
+  * Use less fragile yum/dnf `repolist` in `install_simp_repos` logic
+* Removed
+  * inspec acceptance suite no longer required in GHA matrix
+
+### 1.29.0 / 2022-10-25
+* Fixed:
+  * Compress fixtures before copy to Windows nodes
+
 ### 1.28.0 / 2022-08-05
 * Added:
   * Support RHEL versions without RHN credentials
@@ -27,7 +48,7 @@
     on non-RHEL systems
 * Added:
   * Updated all dependencies to their latest versions where possible and removed
-    depdendencies on deprecated libraries.
+    dependencies on deprecated libraries.
 
 ### 1.24.5 / 2022-05-06
 * Fixed:

data/lib/simp/beaker_helpers/constants.rb

@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
   #
   # This is done so that we know if some new thing that we're using breaks the
   # oldest system that we support
-  DEFAULT_PUPPET_AGENT_VERSION = '~> 6.0'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 7.0'
 
   SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.28.0'
+  VERSION = '1.30.0'
 end

data/lib/simp/beaker_helpers.rb

@@ -11,6 +11,7 @@ module Simp::BeakerHelpers
   require 'simp/beaker_helpers/snapshot'
   require 'simp/beaker_helpers/ssg'
   require 'simp/beaker_helpers/version'
+  require 'find'
 
   @run_in_parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
@@ -395,14 +396,44 @@ module Simp::BeakerHelpers
           Dir.chdir(mod_root) do
             # Have to do things the slow way on Windows
             if is_windows?(sut)
-              Dir.glob('*') do |module_dir|
-                if File.directory?(module_dir)
-                  copy_module_to( sut, {
-                    :source             => module_dir,
-                    :module_name        => module_dir,
-                    :target_module_path => target_module_path
-                  })
+              begin
+                zipfile = "#{Simp::BeakerHelpers.tmpname}.zip"
+                files = []
+
+                # 'zip -x' does not reliably exclude paths, so we need to remove them from
+                #   the list of files to zip
+                Dir.glob('*') do |module_root|
+                  next unless Dir.exist?(module_root)
+                  Find.find("#{module_root}/") do |path|
+                    if PUPPET_MODULE_INSTALL_IGNORE.any? { |ignore| path.include?(ignore) }
+                      Find.prune
+                      next
+                    end
+
+                    files << path
+                  end
+                end
+
+                command = ['zip', zipfile] + files
+                Kernel.system(*command)
+
+                raise("Error: module zip file '#{zipfile}' could not be created at #{mod_root}") unless File.exist?(zipfile)
+                copy_to(sut, zipfile, target_module_path, opts)
+
+                # Windows 2012 and R2 does not natively include PowerShell 5, in which
+                #  the Expand-Archive cmdlet was introduced
+                if fact_on(sut, 'os.release.major').include?('2012')
+                  unzip_cmd = [
+                    "\"[System.Reflection.Assembly]::LoadWithPartialName(\'System.IO.Compression.FileSystem\')",
+                    "[System.IO.Compression.ZipFile]::OpenRead(\'#{target_module_path}\\#{File.basename(zipfile)}\').Entries.FullName \| %{Remove-Item -Path (\"\"\"#{target_module_path}\\$_\"\"\") -Recurse -Force -Confirm:$false -ErrorAction SilentlyContinue}", # rubocop:disable Layout/LineLength
+                    "[System.IO.Compression.ZipFile]::ExtractToDirectory(\'#{target_module_path}\\#{File.basename(zipfile)}\', \'#{target_module_path}\')\"",
+                  ].join(';')
+                else
+                  unzip_cmd = "$ProgressPreference='SilentlyContinue';Expand-Archive -Path #{target_module_path}\\#{File.basename(zipfile)} -DestinationPath #{target_module_path} -Force"
                 end
+                on(sut, powershell(unzip_cmd))
+              ensure
+                FileUtils.remove_entry(zipfile, true)
               end
             else
               begin
@@ -1392,7 +1423,7 @@ module Simp::BeakerHelpers
     unless result
       puppet_gems = nil
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         puppet_gems = %x(gem search -ra -e puppet).match(/\((.+)\)/)
       end
 
@@ -1540,25 +1571,43 @@ module Simp::BeakerHelpers
       to_disable += ENV.fetch('BEAKER_SIMP_disable_repos', '').split(',').map(&:strip)
 
       unless to_disable.empty?
-        if to_disable.include?('simp')
+        if to_disable.include?('simp') || to_disable.include?('simp-community-simp')
           to_disable.delete('simp')
+
+          # legacy community RPM
           to_disable << 'simp-community-simp'
+
+          # SIMP 6.6+ community RPM
+          to_disable << 'SIMP--simp'
         end
 
         if to_disable.include?('simp_deps')
           to_disable.delete('simp_deps')
+          # legacy community RPM
           to_disable << 'simp-community-epel'
           to_disable << 'simp-community-postgres'
           to_disable << 'simp-community-puppet'
+
+          # SIMP 6.6+ community RPM
+          to_disable << 'epel--simp'
+          to_disable << 'postgresql--simp'
+          to_disable << 'puppet--simp'
+          to_disable << 'puppet7--simp'
+          to_disable << 'puppet6--simp'
         end
 
+        logger.info(%{INFO: repos to disable: '#{to_disable.join("', '")}'.})
+
         # NOTE: This --enablerepo enables the repos for listing and is inherited
         # from YUM. This does not actually "enable" the repos, that would require
         # the "--enable" option (from yum-config-manager) :-D.
         #
         # Note: Certain versions of EL8 do not dump by default and EL7 does not
         # have the '--dump' option.
-        available_repos = on(sut, %{yum-config-manager --enablerepo="*" || yum-config-manager --enablerepo="*" --dump}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
+        x = on(sut, %{yum repolist all || dnf repolist --all}).stdout.lines
+        y = x.map{|z| z.gsub(%r{/.*\Z},'')}
+        available_repos = y.grep(/\A([a-zA-Z][a-zA-Z0-9:_-]+)\s*/){|x| $1}
+        logger.info(%{INFO: available repos: '#{available_repos.join("', '")}'.})
 
         invalid_repos = (to_disable - available_repos)
 
@@ -1567,6 +1616,7 @@ module Simp::BeakerHelpers
           logger.warn(%{WARN: install_simp_repo - requested repos to disable do not exist on the target system '#{invalid_repos.join("', '")}'.})
         end
 
+
         (to_disable - invalid_repos).each do |repo|
           on(sut, %{yum-config-manager --disable "#{repo}"})
         end

data/simp-beaker-helpers.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 5.0.0']
-  s.add_runtime_dependency 'beaker-rspec'                , '~> 7.1'
+  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 6.0.0']
+  s.add_runtime_dependency 'beaker-rspec'                , '~> 8.0'
   s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.14', '< 2.0.0']
   s.add_runtime_dependency 'beaker-docker'               , ['>= 0.8.3', '< 2.0.0']
   s.add_runtime_dependency 'docker-api'                  , ['>= 2.1.0', '< 3.0.0']

data/spec/acceptance/nodesets/default.yml

@@ -1,34 +1,27 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   el7:
     roles:
-      - default
-      - el7
+    - default
+    - el7
     platform: el-7-x86_64
     box: centos/7
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-7
+    gce_machine_type: n1-standard-2
   el8:
     roles:
-      - el8
+    - el8
     platform: el-8-x86_64
     box: centos/stream8
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-stream-8
+    gce_machine_type: n1-standard-2
 CONFIG:
-  multi_node: <%= ['yes','true'].include?(ENV['BEAKER_multi_node']) ? true : false %>
+  multi_node: false
   log_level: verbose
   type: aio
   vagrant_cpus: 2
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
   ssh:
     keepalive: true
     keepalive_interval: 10
@@ -40,3 +33,4 @@ CONFIG:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
     hmac:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"

data/spec/acceptance/nodesets/docker.yml

@@ -6,7 +6,7 @@ HOSTS:
     platform:   el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el7
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
 
   el8.test.net:
     roles:
@@ -14,7 +14,7 @@ HOSTS:
     platform:   el-8-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el8
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
 
 CONFIG:
   log_level: verbose

data/spec/acceptance/nodesets/ubuntu.yml

@@ -1,21 +1,14 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   focal:
     roles:
-      - default
+    - default
     platform: ubuntu-20.04-x86_64
     box: ubuntu/focal64
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: ubuntu-os-cloud/ubuntu-2004-lts
+    gce_machine_type: n1-standard-2
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"

data/spec/acceptance/suites/default/check_puppet_version_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper_acceptance'
 
+unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
+  fail('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+end
+
+if ENV['BEAKER_PUPPET_COLLECTION']
+  target_version = ENV['BEAKER_PUPPET_COLLECTION'][/(\d+)$/,1]
+elsif ENV['PUPPET_VERSION']
+  target_version = ENV['PUPPET_VERSION'].split('.').first
+end
+
 hosts.each do |host|
   describe 'make sure puppet version is valid' do
     context "on #{host}" do
-      puppet_collection = host.options[:puppet_collection]
-
-      client_puppet_version = on(host, 'puppet --version').stdout.strip
-
-      if puppet_collection =~ /puppet(\d+)/
-        puppet_collection_version = $1
+      client_puppet_version = on(host, 'puppet --version').output.lines.last.strip
 
-        it "should be running puppet version #{puppet_collection_version}" do
-          expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
-        end
-      else
-        it 'should be running puppet 6' do
-          expect(client_puppet_version.split('.').first).to eq '6'
-        end
+      it "should be running puppet version #{target_version}" do
+        expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)
       end
     end
   end

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -8,7 +8,7 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "fact_on(default,'root_home')" do
     it 'should not return value of `root_home`' do
-      expect(fact_on(default, 'root_home')).to eq ''
+      expect(fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 
@@ -26,7 +26,7 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "pfact_on(default,'os.release.foo')" do
     it 'should not return the value of `os.release.foo`' do
-      expect(pfact_on(default, 'os.release.foo')).to eq ''
+      expect(pfact_on(default, 'os.release.foo').to_s).to eq ''
     end
   end
 

data/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/acceptance/suites/fips_from_fixtures/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/fips_from_fixtures/../../nodesets
+../../nodesets

data/spec/acceptance/suites/inspec/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/inspec/../../nodesets
+../../nodesets

data/spec/acceptance/suites/snapshot/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/snapshot/../../nodesets
+../../nodesets

data/spec/acceptance/suites/ssg/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/ssg/../../nodesets
+../../nodesets

data/spec/acceptance/suites/windows/nodesets/default.yml

@@ -1,34 +1,26 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   win:
     roles:
-      - windows
+    - windows
     platform: windows-server-amd64
-    box: devopsgroup-io/windows_server-2012r2-standard-amd64-nocm
-    hypervisor: <%= hypervisor %>
+    box: gusztavvargadr/windows-server
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
     is_cygwin: false
-    ssh:
-      host_key: ssh-dss
-
+    family: windows-cloud/windows-2022
+    gce_machine_type: n1-standard-2
   el7:
     roles:
-      - default
+    - default
     platform: el-7-x86_64
     box: centos/7
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-7
+    gce_machine_type: n1-standard-2
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
-  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"

data/spec/acceptance/suites/windows/nodesets/win2012.yml

@@ -0,0 +1,28 @@
+---
+HOSTS:
+  win:
+    roles:
+    - windows
+    platform: windows-server-amd64
+    box: devopsgroup-io/windows_server-2012r2-standard-amd64-nocm
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    is_cygwin: false
+    ssh:
+      host_key: ssh-dss
+    family: windows-cloud/windows-2012-r2
+    gce_machine_type: n1-standard-2
+  el7:
+    roles:
+    - default
+    platform: el-7-x86_64
+    box: centos/7
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-7
+    gce_machine_type: n1-standard-2
+CONFIG:
+  log_level: verbose
+  type: aio
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"

data/spec/acceptance/suites/windows/nodesets/win2016.yml

@@ -1,34 +1,27 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   win:
     roles:
-      - windows
+    - windows
     platform: windows-server-amd64
-    box: gusztavvargadr/windows-server
-    box_version: 1607.0.1909
-    hypervisor: <%= hypervisor %>
+    box: peru/windows-server-2016-standard-x64-eval
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
     communicator: winrm
     is_cygwin: false
-
+    family: windows-cloud/windows-2016
+    gce_machine_type: n1-standard-2
   el7:
     roles:
-      - default
+    - default
     platform: el-7-x86_64
     box: centos/7
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-7
+    gce_machine_type: n1-standard-2
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
-  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"