beaker-puppet 3.0.0 → 4.0.0

data/Rakefile

@@ -189,7 +189,7 @@ else
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
     config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog]
-    config.user = 'voxpupuli'
+    config.user = 'puppetlabs'
     config.project = 'beaker-puppet'
     config.future_release = "#{Gem::Specification.load("#{config.project}.gemspec").version}"
   end

data/beaker-puppet.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'beaker-vmpooler', '~> 1.4'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~> 5.0'
+  s.add_runtime_dependency 'beaker', '>= 5.0', '< 7'
   s.add_runtime_dependency 'oga', '~> 3.4'
 end

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -303,7 +303,7 @@ module Beaker
                 family = ::Regexp.last_match(1)
                 relver = ::Regexp.last_match(2)
                 install_puppet_from_rpm_on(host, opts.merge(release: relver, family: family))
-              elsif host['platform'] =~ /(ubuntu|debian|huaweios)/
+              elsif host['platform'] =~ /(ubuntu|debian)/
                 install_puppet_from_deb_on(host, opts)
               elsif host['platform'] =~ /windows/
                 relver = opts[:version]
@@ -406,10 +406,10 @@ module Beaker
               end
 
               case host['platform']
-              when /amazon|el-|redhat|fedora|sles|centos|cisco_/
+              when /amazon|el-|redhat|fedora|sles|centos/
                 package_name = 'puppet-agent'
                 package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
-              when /debian|ubuntu|huaweios/
+              when /debian|ubuntu/
                 package_name = 'puppet-agent'
                 if opts[:puppet_agent_version]
                   package_name << "=#{opts[:puppet_agent_version]}-1#{host['platform'].codename}"
@@ -921,9 +921,9 @@ module Beaker
 
             unless host.check_for_command('gem')
               gempkg = case host['platform']
-                       when /solaris-11/                            then 'ruby-18'
-                       when /ubuntu-14/                             then 'ruby'
-                       when /solaris-10|ubuntu|debian|el-|huaweios/ then 'rubygems'
+                       when /solaris-11/                   then 'ruby-18'
+                       when /ubuntu-14/                    then 'ruby'
+                       when /solaris-10|ubuntu|debian|el-/ then 'rubygems'
                        when /openbsd/ then 'ruby'
                        else
                          raise 'install_puppet() called with default_action ' +
@@ -937,7 +937,7 @@ module Beaker
             # Link 'gem' to /usr/bin instead of adding /opt/csw/bin to PATH.
             on host, 'ln -s /opt/csw/bin/gem /usr/bin/gem' if is_solaris10
 
-            if host['platform'] =~ /debian|ubuntu|solaris|huaweios/
+            if host['platform'] =~ /debian|ubuntu|solaris/
               gem_env = YAML.load(on(host, 'gem environment').stdout)
               gem_paths_array = gem_env['RubyGems Environment'].find { |h| h['GEM PATHS'] != nil }['GEM PATHS']
               path_with_gem = 'export PATH=' + gem_paths_array.join(':') + ':${PATH}'
@@ -993,16 +993,8 @@ module Beaker
             opts = sanitize_opts(opts)
 
             case variant
-            when /^(amazon|fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
+            when /^(amazon|fedora|el|redhat|centos|sles)$/
               variant_url_value = (%w[redhat centos].include?(::Regexp.last_match(1)) ? 'el' : ::Regexp.last_match(1))
-              if variant == 'cisco_nexus'
-                variant_url_value = 'cisco-wrlinux'
-                version = '5'
-              end
-              if variant == 'cisco_ios_xr'
-                variant_url_value = 'cisco-wrlinux'
-                version = '7'
-              end
               if repo_name.match(/puppet\d*/)
                 url = if repo_name.match(/-nightly$/)
                         opts[:nightly_yum_repo_url]
@@ -1028,19 +1020,11 @@ module Beaker
                 end
               end
 
-              if variant == 'cisco_nexus'
-                # cisco nexus requires using yum to install the repo
-                host.install_package(remote)
-              elsif variant == 'cisco_ios_xr'
-                # cisco ios xr requires using yum to localinstall the repo
-                on host, "yum -y localinstall #{remote}"
-              else
-                opts[:package_proxy] ||= false
-                host.install_package_with_rpm(remote, '--replacepkgs',
-                                              { package_proxy: opts[:package_proxy] })
-              end
+              opts[:package_proxy] ||= false
+              host.install_package_with_rpm(remote, '--replacepkgs',
+                                            { package_proxy: opts[:package_proxy] })
 
-            when /^(debian|ubuntu|huaweios)$/
+            when /^(debian|ubuntu)$/
               if repo_name.match(/puppet\d*/)
                 url = if repo_name.match(/-nightly$/)
                         opts[:nightly_apt_repo_url]
@@ -1111,14 +1095,10 @@ module Beaker
             File.write(repo, contents)
           end
 
-          to_path = if host[:platform] =~ /cisco_nexus/
-                      "#{host.package_config_dir}/#{File.basename(repo)}"
-                    else
-                      host.package_config_dir
-                    end
+          to_path = host.package_config_dir
           scp_to(host, repo, to_path)
 
-          on(host, 'apt-get update') if host['platform'] =~ /ubuntu-|debian-|huaweios-/
+          on(host, 'apt-get update') if host['platform'] =~ /ubuntu-|debian-/
           nil
         end
 
@@ -1148,7 +1128,7 @@ module Beaker
                                         repo_configs_dir = nil,
                                         opts = options)
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
+          if variant !~ /^(amazon|fedora|el|redhat|centos|debian|ubuntu|sles)$/
             raise "No repository installation step for #{variant} yet..."
           end
 
@@ -1162,7 +1142,7 @@ module Beaker
           # url type
           _, protocol, hostname = opts[:dev_builds_url].partition %r{.*://}
           dev_builds_url = protocol + hostname
-          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|redhat|centos)$/
+          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(amazon|fedora|el|redhat|centos)$/
 
           install_repo_configs(host, dev_builds_url, package_name,
                                build_version, platform_configs_dir)
@@ -1181,7 +1161,7 @@ module Beaker
         # @note This method is paired to be run directly after {#install_puppetlabs_dev_repo}
         #
         def install_packages_from_local_dev_repo(host, package_name)
-          if host['platform'] =~ /debian|ubuntu|huaweios/
+          if host['platform'] =~ /debian|ubuntu/
             find_filename = '*.deb'
             find_command  = 'dpkg -i'
           elsif host['platform'] =~ /fedora|el|redhat|centos/
@@ -1269,7 +1249,7 @@ module Beaker
 
           # We have to do some silly version munging if we're on a deb-based platform
           case host['platform']
-          when /debian|ubuntu|huaweios/
+          when /debian|ubuntu/
             opts[:version] = "#{opts[:version]}-1#{host['platform'].codename}" if opts[:version]
           end
 
@@ -1291,7 +1271,7 @@ module Beaker
             cmdline_args = ''
             # query packages
             case host[:platform]
-            when /huaweios|ubuntu/
+            when /ubuntu/
               pkgs = on(host, "dpkg-query -l  | awk '{print $2}' | grep -E '(^pe-|puppet)'",
                         acceptable_exit_codes: [0, 1]).stdout.chomp.split(/\n+/)
             when /aix|sles|el|redhat|centos|oracle|scientific/

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '3.0.0'
+  VERSION = '4.0.0'
 end

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -818,48 +818,6 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppetlabs_release_repo_on(host)
       end
     end
-
-    context 'on debian 8' do
-      let(:platform) { Beaker::Platform.new('debian-8-i386') }
-      it 'returns the correct url when repo is set to puppet4' do
-        expect(subject).to receive(:on).with(host, /puppet4-release-jessie\.deb$/).once
-        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
-        expect(subject).to receive(:on).with(host, 'apt-get update').once
-        subject.install_puppetlabs_release_repo_on(host, 'puppet4')
-      end
-      it 'returns the correct url when opts[:puppet_collection] is set to puppet7' do
-        expect(subject).to receive(:on).with(host, /puppet7-release-jessie\.deb$/).once
-        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
-        expect(subject).to receive(:on).with(host, 'apt-get update').once
-        subject.install_puppetlabs_release_repo_on(host, nil, { puppet_collection: 'puppet7' })
-      end
-      it 'returns the correct url when both repo and opts[:puppet_collection] are nil' do
-        expect(subject).to receive(:on).with(host, /puppet-release-jessie\.deb$/).once
-        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
-        expect(subject).to receive(:on).with(host, 'apt-get update').once
-        subject.install_puppetlabs_release_repo_on(host)
-      end
-    end
-
-    context 'on cisco platforms' do
-      context 'version 5' do
-        let(:platform) { Beaker::Platform.new('cisco_nexus-7-x86_64') }
-
-        it 'calls host.install_package' do
-          expect(host).to receive(:install_package).with(/\.rpm$/)
-          subject.install_puppetlabs_release_repo_on(host)
-        end
-      end
-
-      context 'version 7' do
-        let(:platform) { Beaker::Platform.new('cisco_ios_xr-6-x86_64') }
-
-        it 'uses yum localinstall to install the package' do
-          expect(subject).to receive(:on).with(host, /^yum.*localinstall.*\.rpm$/)
-          subject.install_puppetlabs_release_repo_on(host)
-        end
-      end
-    end
   end
 
   describe '#install_puppetlabs_dev_repo' do
@@ -884,6 +842,8 @@ describe ClassMixedWithDSLInstallUtils do
         allow(rez).to receive(:exit_code) { 0 }
         allow(subject).to receive(:link_exists?).and_return(true)
         expect(subject).to receive(:scp_to).with(host, repo_config, /.*/).ordered
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).with('repoconfig').and_return('')
         subject.install_puppetlabs_dev_repo host, package_name, package_version
       end
     end
@@ -960,7 +920,7 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'fails correctly for systems not accounted for' do
-      @platform = 'eos-1-3'
+      @platform = 'freebsd-1-3'
       expect { subject.install_packages_from_local_dev_repo(host, package_name) }.to raise_error RuntimeError
     end
   end
@@ -1108,10 +1068,10 @@ describe ClassMixedWithDSLInstallUtils do
       version = '6.6.6'
 
       context 'on deb-based platform' do
-        let(:host) { make_host('master', platform: Beaker::Platform.new('ubuntu-16.04-amd64')) }
-        it 'munges the version on ubuntu 16.04' do
+        let(:host) { make_host('master', platform: Beaker::Platform.new('ubuntu-24.04-amd64')) }
+        it 'munges the version on ubuntu 24.04' do
           expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', anything)
-          expect(subject).to receive(:install_package).with(host, 'puppetserver', "#{version}-1xenial")
+          expect(subject).to receive(:install_package).with(host, 'puppetserver', "#{version}-1noble")
           allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return false
           subject.install_puppetserver_on(host, version: version)
         end

data/spec/helpers.rb

@@ -120,9 +120,7 @@ module HostHelpers
 end
 
 module PlatformHelpers
-  DEBIANPLATFORMS = %w[debian
-                       ubuntu
-                       huaweios]
+  DEBIANPLATFORMS = %w[debian ubuntu]
 
   FEDORASYSTEMD    = (14..29).to_a.collect! { |i| "fedora-#{i}" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -104,16 +104,22 @@ dependencies:
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement