beaker-puppet 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed92db1a5ff7b3d48c3d1c3f183d9640c5f730bcfd7231a35590123a32a7cf83
-  data.tar.gz: 91a53c69a0f91c18243596de90c59be2b03ad48dd675e9c8e77243be800531d9
+  metadata.gz: 413a669d5587e9a9383879b9fc9ae0dfa7fe6215a7bc970b053df9565318c062
+  data.tar.gz: ecf64aaa4593c25ca6f1b0e8e963ed6f7191fc9d5a3ebf521806a7b80b130e78
 SHA512:
-  metadata.gz: 4236f87fc9d708444991301675fd0dfaad82b5c8f0c965d9102d0893540157dd32a34ab93f7fae56219bade0314a357dd7ab9642d65b336f8e9bc324152b9965
-  data.tar.gz: badc58897f5f7eb894d5f92e9f4dc4a5d943d244254e55d0e9cc5e7afaa53b9df571084fca2f50b44d991cefc45277fb3353aaecdac11893605b4d5578e48602
+  metadata.gz: bd806ebd7b80d20a08d75faff6f075775a5d6a11a3c4be02fa801c81bac8adbabeed791021d7f215158666cca62abc79489c4240ad9cc70784c63653fdc2af47
+  data.tar.gz: acb9a8bb1554d6dc4f0c54ae4b9c12674b5215846ee3a73047e0c6e2b52ed30b83d81298ef53bfc0e395919da87f1bca2131205eb1935982d751cdc7becabfe7

data/.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'puppetlabs'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -38,7 +38,7 @@ jobs:
       COVERAGE: ${{ matrix.coverage }}
     name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:

data/.github_changelog_generator

@@ -0,0 +1,3 @@
+project=beaker-puppet
+user=puppetlabs
+exclude_labels=maintenance

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-05-05 13:27:13 UTC using RuboCop version 1.50.2.
+# on 2023-12-19 12:29:40 UTC using RuboCop version 1.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -15,6 +15,7 @@ Gemspec/DeprecatedAttributeAssignment:
     - 'beaker-puppet.gemspec'
 
 # Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -79,8 +80,14 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/beaker-puppet/helpers/facter_helpers_spec.rb'
     - 'spec/beaker-puppet/helpers/puppet_helpers_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/RedundantRequireStatement:
   Exclude:
     - 'spec/spec_helper.rb'
@@ -133,6 +140,7 @@ Lint/UnusedMethodArgument:
     - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
 
 # Offense count: 17
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/UselessAssignment:
   Exclude:
     - 'acceptance/tests/clone_git_repo_on_test.rb'
@@ -276,12 +284,13 @@ Performance/StringReplacement:
     - 'lib/beaker-puppet/install_utils/windows_utils.rb'
     - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
 
-# Offense count: 5
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/BeEq:
   Exclude:
     - 'spec/beaker-puppet/helpers/tk_helpers_spec.rb'
     - 'spec/beaker-puppet/install_utils/ezbake_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
     - 'spec/beaker-puppet/install_utils/module_utils_spec.rb'
 
 # Offense count: 2
@@ -336,6 +345,12 @@ RSpec/EmptyLineAfterHook:
     - 'spec/beaker-puppet/helpers/tk_helpers_spec.rb'
     - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/Eq:
+  Exclude:
+    - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
+
 # Offense count: 138
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
@@ -388,7 +403,7 @@ RSpec/HookArgument:
     - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
 
 # Offense count: 2
-# Configuration parameters: Max.
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
   Exclude:
     - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
@@ -494,6 +509,16 @@ RSpec/ReceiveCounts:
     - 'spec/beaker-puppet/helpers/puppet_helpers_spec.rb'
     - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
 
+# Offense count: 66
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/beaker-puppet/helpers/puppet_helpers_spec.rb'
+    - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/module_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
+    - 'spec/helpers.rb'
+
 # Offense count: 19
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/ReceiveNever:
@@ -519,6 +544,24 @@ RSpec/ReturnFromStub:
     - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
     - 'spec/beaker-puppet/install_utils/puppet5_spec.rb'
 
+# Offense count: 11
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/beaker-puppet/helpers/facter_helpers_spec.rb'
+    - 'spec/beaker-puppet/helpers/host_helpers_spec.rb'
+    - 'spec/beaker-puppet/helpers/puppet_helpers_spec.rb'
+    - 'spec/beaker-puppet/helpers/tk_helpers_spec.rb'
+    - 'spec/beaker-puppet/install_utils/ezbake_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/foss_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/module_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/puppet5_spec.rb'
+    - 'spec/beaker-puppet/install_utils/puppet_utils_spec.rb'
+    - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
+    - 'spec/beaker-puppet/wrappers_spec.rb'
+
 # Offense count: 106
 RSpec/StubbedMock:
   Exclude:
@@ -642,11 +685,13 @@ Style/ClassAndModuleChildren:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
 Style/CollectionCompact:
   Exclude:
     - 'lib/beaker-puppet/install_utils/foss_utils.rb'
 
 # Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CombinableLoops:
   Exclude:
     - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
@@ -694,7 +739,7 @@ Style/IdenticalConditionalBranches:
     - 'lib/beaker-puppet/helpers/tk_helpers.rb'
     - 'lib/beaker-puppet/install_utils/ezbake_utils.rb'
 
-# Offense count: 12
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
@@ -736,7 +781,7 @@ Style/NonNilCheck:
   Exclude:
     - 'lib/beaker-puppet/install_utils/foss_utils.rb'
 
-# Offense count: 10
+# Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
@@ -834,7 +879,7 @@ Style/ZeroLengthPredicate:
     - 'lib/beaker-puppet/helpers/puppet_helpers.rb'
     - 'lib/beaker-puppet/install_utils/foss_utils.rb'
 
-# Offense count: 121
+# Offense count: 122
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -2,13 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.1.0](https://github.com/voxpupuli/beaker-puppet/tree/2.1.0) (2024-03-19)
+## [3.0.0](https://github.com/puppetlabs/beaker-puppet/tree/3.0.0) (2024-02-14)
 
-[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/2.0.0...2.1.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/2.0.0...3.0.0)
+
+**Breaking changes:**
+
+- Beaker 5 compatibility [\#240](https://github.com/puppetlabs/beaker-puppet/pull/240) ([mhashizume](https://github.com/mhashizume))
 
 **Implemented enhancements:**
 
-- \[PA-6181\]: Fix acceptance test failure caused due to addition of Amazon Linux 2023 in pe-client-tools for orchestrator client pipeline [\#250](https://github.com/puppetlabs/beaker-puppet/pull/250) ([span786](https://github.com/span786))
+- Add the ability to install puppet-agent from a local dev build [\#239](https://github.com/puppetlabs/beaker-puppet/pull/239) ([joshcooper](https://github.com/joshcooper))
+- Add Amazon linux 2023 platform support [\#228](https://github.com/puppetlabs/beaker-puppet/pull/228) ([span786](https://github.com/span786))
+
+**Fixed bugs:**
+
+- Ensure post-suite and destroy execute [\#238](https://github.com/puppetlabs/beaker-puppet/pull/238) ([joshcooper](https://github.com/joshcooper))
+- fix beaker exec when called from bundle exec [\#232](https://github.com/puppetlabs/beaker-puppet/pull/232) ([h0tw1r3](https://github.com/h0tw1r3))
+- Loosen expectations while attempting to delete puppet related files [\#225](https://github.com/puppetlabs/beaker-puppet/pull/225) ([tvpartytonight](https://github.com/tvpartytonight))
 
 ## [2.0.0](https://github.com/voxpupuli/beaker-puppet/tree/2.0.0) (2023-05-05)
 

data/CODEOWNERS

@@ -0,0 +1 @@
+* @puppetlabs/phoenix @puppetlabs/unicorn

data/README.md

@@ -1,12 +1,11 @@
 # beaker-puppet: The Puppet-Specific Beaker Library
 
-[![License](https://img.shields.io/github/license/voxpupuli/beaker-puppet.svg)](https://github.com/voxpupuli/beaker-puppet/blob/master/LICENSE)
-[![Test](https://github.com/voxpupuli/beaker-puppet/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker-puppet/actions/workflows/test.yml)
-[![codecov](https://codecov.io/gh/voxpupuli/beaker-puppet/branch/master/graph/badge.svg?token=Mypkl78hvK)](https://codecov.io/gh/voxpupuli/beaker-puppet)
-[![Release](https://github.com/voxpupuli/beaker-puppet/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker-puppet/actions/workflows/release.yml)
+[![License](https://img.shields.io/github/license/puppetlabs/beaker-puppet.svg)](https://github.com/puppetlabs/beaker-puppet/blob/master/LICENSE)
+[![Test](https://github.com/puppetlabs/beaker-puppet/actions/workflows/test.yml/badge.svg)](https://github.com/puppetlabs/beaker-puppet/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/puppetlabs/beaker-puppet/branch/master/graph/badge.svg?token=Mypkl78hvK)](https://codecov.io/gh/puppetlabs/beaker-puppet)
+[![Release](https://github.com/puppetlabs/beaker-puppet/actions/workflows/release.yml/badge.svg)](https://github.com/puppetlabs/beaker-puppet/actions/workflows/release.yml)
 [![RubyGem Version](https://img.shields.io/gem/v/beaker-puppet.svg)](https://rubygems.org/gems/beaker-puppet)
 [![RubyGem Downloads](https://img.shields.io/gem/dt/beaker-puppet.svg)](https://rubygems.org/gems/beaker-puppet)
-[![Donated by Puppet Inc](https://img.shields.io/badge/donated%20by-Puppet%20Inc-fb7047.svg)](#transfer-notice)
 
 The purpose of this library is to hold all puppet-specific info & DSL methods.
 This includes all helper & installer methods.
@@ -79,14 +78,6 @@ file, or you can provide a beaker-hostgenerator value to the `TEST_TARGET`
 environment variable. You can also specify the tests that get executed with the
 `TESTS` environment variable.
 
-## Transfer Notice
-
-This plugin was originally authored by [Puppet Inc](http://puppet.com).
-The maintainer preferred that Puppet Community take ownership of the module for future improvement and maintenance.
-Existing pull requests and issues were transferred over, please fork and continue to contribute here.
-
-Previously: https://github.com/puppetlabs/beaker
-
 ## License
 
 This gem is licensed under the Apache-2 license.

data/acceptance/tests/stub_host.rb

@@ -44,7 +44,7 @@ step 'verify with_stub_host_on' do
     hosts.each do |host|
       hosts_file = get_hosts_file(host)
       result = on host, "cat #{hosts_file}"
-      assert_no_match(/sleepy/, result.stdout)
+      refute_match(/sleepy/, result.stdout)
     end
   end
 end

data/beaker-puppet.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = 'For use for the Beaker acceptance testing tool'
   s.license     = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 2.7', '< 3.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its', '~> 1.3'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.2'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.1.0'
 
   # Acceptance Testing Dependencies
   s.add_development_dependency 'beaker-vmpooler', '~> 1.4'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~> 4.1'
+  s.add_runtime_dependency 'beaker', '~> 5.0'
   s.add_runtime_dependency 'oga', '~> 3.4'
 end

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -81,21 +81,13 @@ module Beaker
         # Test Puppet running in a certain run mode with specific options.
         # This ensures the following steps are performed:
         # 1. The pre-test Puppet configuration is backed up
-        # 2. A new Puppet configuraton file is layed down
+        # 2. Lay down a new Puppet configuraton file
         # 3. Puppet is started or restarted in the specified run mode
         # 4. Ensure Puppet has started correctly
         # 5. Further tests are yielded to
         # 6. Revert Puppet to the pre-test state
         # 7. Testing artifacts are saved in a folder named for the test
         #
-        # @note Whether Puppet is started or restarted depends on what kind of
-        #   server you're running.  Passenger and puppetserver are restarted before.
-        #   Webrick is started before and stopped after yielding, unless you're using
-        #   service scripts, then it'll behave like passenger & puppetserver.
-        #   Passenger and puppetserver (or webrick using service scripts)
-        #   restart after yielding by default.  You can stop this from happening
-        #   by setting the :restart_when_done flag of the conf_opts argument.
-        #
         # @param [Host] host        One object that act like Host
         #
         # @param [Hash{Symbol=>String}] conf_opts  Represents puppet settings.
@@ -112,22 +104,11 @@ module Beaker
         #
         #                            These will only be applied when starting a FOSS
         #                            master, as a pe master is just bounced.
-        # @option conf_opts [Hash]   :__service_args__  A special setting of options
-        #                            for controlling how the puppet master service is
-        #                            handled. The only setting currently is
-        #                            :bypass_service_script, which if set true will
-        #                            force stopping and starting a webrick master
-        #                            using the start_puppet_from_source_* methods,
-        #                            even if it seems the host has passenger.
-        #                            This is needed in FOSS tests to initialize
-        #                            SSL.
         # @option conf_opts [Boolean] :restart_when_done  determines whether a restart
         #                            should be run after the test has been yielded to.
         #                            Will stop puppet if false. Default behavior
         #                            is to restart, but you can override this on the
         #                            host or with this option.
-        #                            (Note: only works for passenger & puppetserver
-        #                            masters (or webrick using the service scripts))
         # @param [File] testdir      The temporary directory which will hold backup
         #                            configuration, and other test artifacts.
         #
@@ -156,12 +137,11 @@ module Beaker
           end
 
           cmdline_args = conf_opts[:__commandline_args__]
-          service_args = conf_opts[:__service_args__] || {}
           restart_when_done = true
           restart_when_done = host[:restart_when_done] if host.has_key?(:restart_when_done)
           restart_when_done = conf_opts.fetch(:restart_when_done, restart_when_done)
           conf_opts = conf_opts.reject do |k, v|
-            %i[__commandline_args__ __service_args__ restart_when_done].include?(k)
+            %i[__commandline_args__ restart_when_done].include?(k)
           end
 
           curl_retries = host['master-start-curl-retries'] || options['master-start-curl-retries']
@@ -202,13 +182,8 @@ module Beaker
                                           puppet_config(host, 'confdir', section: 'master'),
                                           testdir,
                                           'puppet.conf')
-            lay_down_new_puppet_conf host, conf_opts, testdir
-
-            if host.use_service_scripts? && !service_args[:bypass_service_script]
-              bounce_service(host, host['puppetservice'], curl_retries)
-            else
-              puppet_master_started = start_puppet_from_source_on!(host, cmdline_args)
-            end
+            lay_down_new_puppet_conf(host, conf_opts, testdir)
+            bounce_service(host, host['puppetservice'], curl_retries)
 
             yield self if block_given?
 
@@ -229,20 +204,11 @@ module Beaker
             raise(original_exception)
           ensure
             begin
-              if host.use_service_scripts? && !service_args[:bypass_service_script]
-                restore_puppet_conf_from_backup(host, backup_file)
-                if restart_when_done
-                  bounce_service(host, host['puppetservice'], curl_retries)
-                else
-                  host.exec puppet_resource('service', host['puppetservice'], 'ensure=stopped')
-                end
+              restore_puppet_conf_from_backup(host, backup_file)
+              if restart_when_done
+                bounce_service(host, host['puppetservice'], curl_retries)
               else
-                if puppet_master_started
-                  stop_puppet_from_source_on(host)
-                else
-                  dump_puppet_log(host)
-                end
-                restore_puppet_conf_from_backup(host, backup_file)
+                host.exec puppet_resource('service', host['puppetservice'], 'ensure=stopped')
               end
             rescue Exception => teardown_exception
               begin
@@ -281,19 +247,6 @@ module Beaker
           end
         end
 
-        # @!visibility private
-        def start_puppet_from_source_on!(host, args = '')
-          host.exec(puppet('master', args))
-
-          logger.debug 'Waiting for the puppet master to start'
-          raise Beaker::DSL::FailTest, 'Puppet master did not start in a timely fashion' unless port_open_within?(
-            host, 8140, 10
-          )
-
-          logger.debug 'The puppet master has started'
-          true
-        end
-
         # @!visibility private
         def stop_puppet_from_source_on(host)
           pid = host.exec(Command.new('cat `puppet config print --section master pidfile`')).stdout.chomp
@@ -355,19 +308,12 @@ module Beaker
         def bounce_service(host, service, curl_retries = nil, port = nil)
           curl_retries = 120 if curl_retries.nil?
           port = options[:puppetserver_port] if port.nil?
-          if host.graceful_restarts?
-            service = host.check_for_command('apache2ctl') ? 'apache2ctl' : 'apachectl'
-            apachectl_path = host.is_pe? ? "#{host['puppetsbindir']}/#{service}" : service
-            host.exec(Command.new("#{apachectl_path} graceful"))
-          else
-            result = host.exec(Command.new("service #{service} reload"),
-                               acceptable_exit_codes: [0, 1, 3])
-            return result if result.exit_code == 0
+          result = host.exec(Command.new("service #{service} reload"), acceptable_exit_codes: [0, 1, 3])
+          return result if result.exit_code == 0
 
-            host.exec puppet_resource('service', service, 'ensure=stopped')
-            host.exec puppet_resource('service', service, 'ensure=running')
+          host.exec puppet_resource('service', service, 'ensure=stopped')
+          host.exec puppet_resource('service', service, 'ensure=running')
 
-          end
           curl_with_retries(" #{service} ", host, "https://localhost:#{port}", [35, 60], curl_retries)
         end
 
@@ -819,28 +765,17 @@ module Beaker
         def sign_certificate_for(host = [])
           hostnames = []
           hosts = host.is_a?(Array) ? host : [host]
-          puppet_version = on(master, puppet('--version')).stdout.chomp
           hosts.each do |current_host|
             if [master, dashboard, database].include? current_host
-              on current_host, puppet('agent -t'), acceptable_exit_codes: [0, 1, 2]
-
-              if version_is_less(puppet_version, '5.99')
-                on master, puppet("cert --allow-dns-alt-names sign #{current_host}"), acceptable_exit_codes: [0, 24]
-              else
-                on master, "puppetserver ca sign --certname #{current_host}"
-              end
+              on(current_host, puppet('agent -t'), acceptable_exit_codes: [0, 1, 2])
+              on(master, "puppetserver ca sign --certname #{current_host}")
             else
               hostnames << Regexp.escape(current_host.node_name)
             end
           end
 
           if hostnames.size < 1
-            if version_is_less(puppet_version, '5.99')
-              on master, puppet('cert --sign --all --allow-dns-alt-names'),
-                 acceptable_exit_codes: [0, 24]
-            else
-              on master, 'puppetserver ca sign --all', acceptable_exit_codes: [0, 24]
-            end
+            on(master, 'puppetserver ca sign --all', acceptable_exit_codes: [0, 24])
             return
           end
 
@@ -852,21 +787,11 @@ module Beaker
                 fail_test("Failed to sign cert for #{hostnames}")
                 hostnames.clear
               end
-
-              if version_is_less(puppet_version, '5.99')
-                on master, puppet('cert --sign --all --allow-dns-alt-names'), acceptable_exit_codes: [0, 24]
-                out = on(master, puppet('cert --list --all')).stdout
-                if hostnames.all? { |hostname| out =~ /\+ "?#{hostname}"?/ }
-                  hostnames.clear
-                  break
-                end
-              else
-                on master, 'puppetserver ca sign --all', acceptable_exit_codes: [0, 24]
-                out = on(master, 'puppetserver ca list --all').stdout
-                if out !~ /.*Requested.*/ && hostnames.all? { |hostname| out =~ /\b#{hostname}\b/ }
-                  hostnames.clear
-                  break
-                end
+              on(master, 'puppetserver ca sign --all', acceptable_exit_codes: [0, 24])
+              out = on(master, 'puppetserver ca list --all').stdout
+              if out !~ /.*Requested.*/ && hostnames.all? { |hostname| out =~ /\b#{hostname}\b/ }
+                hostnames.clear
+                break
               end
 
               sleep next_sleep