beaker 5.8.1 → 6.0.0

data/lib/beaker/options/command_line_parser.rb

@@ -204,7 +204,7 @@ module Beaker
           end
 
           opts.on '--repo-proxy',
-                  'Proxy packaging repositories on ubuntu, debian, cumulus and solaris-11',
+                  'Proxy packaging repositories on ubuntu, debian and solaris-11',
                   '(default: false)' do
             @cmd_options[:repo_proxy] = true
           end

data/lib/beaker/options/parser.rb

@@ -364,10 +364,10 @@ module Beaker
 
         @validator.validate_master_count(master)
 
-        # check that windows/el-4 boxes are only agents (solaris can be a master in foss cases)
+        # check that windows boxes are only agents (solaris can be a master in foss cases)
         @options[:HOSTS].each_key do |name|
           host = @options[:HOSTS][name]
-          test_host_roles(name, host) if /windows|el-4/.match?(host[:platform])
+          test_host_roles(name, host) if host[:platform].include?('windows')
 
           # check to see if a custom user account has been provided, if so use it
           host[:user] = host[:ssh][:user] if host[:ssh] && host[:ssh][:user]

data/lib/beaker/perf.rb

@@ -3,8 +3,8 @@ module Beaker
   class Perf
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
-    PERF_SUPPORTED_PLATFORMS = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|opensuse|sles/
-    PERF_START_PLATFORMS     = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
+    PERF_SUPPORTED_PLATFORMS = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|opensuse|sles/
+    PERF_START_PLATFORMS     = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el/
 
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
     # was used as an option on the Baker command line invocation. Instances of this class do not
@@ -36,7 +36,7 @@ module Beaker
         @logger.perf_output("Perf (sysstat) not supported on host: " + host)
       end
 
-      if /debian|ubuntu|cumulus/.match?(host['platform'])
+      if /debian|ubuntu/.match?(host['platform'])
         @logger.perf_output("Modify /etc/default/sysstat on Debian and Ubuntu platforms")
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
       elsif /opensuse|sles/.match?(host['platform'])

data/lib/beaker/platform.rb

@@ -3,40 +3,18 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    # rubocop:disable Layout/LineLength
-    PLATFORMS = /^(alpine|amazon|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
-    # rubocop:enable Layout/LineLength
+    PLATFORMS = /^(alpine|amazon|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "forky" => "14",
                      "trixie" => "13",
                      "bookworm" => "12",
                      "bullseye" => "11",
-                     "buster" => "10",
-                     "stretch" => "9",
-                     "jessie" => "8",
-                     "wheezy" => "7",
-                     "squeeze" => "6", },
+                     "buster" => "10", },
         :ubuntu => { "noble" => "2404",
                      "jammy" => "2204",
                      "focal" => "2004",
-                     "eoan" => "1910",
-                     "disco" => "1904",
-                     "cosmic" => "1810",
-                     "bionic" => "1804",
-                     "artful" => "1710",
-                     "zesty" => "1704",
-                     "yakkety" => "1610",
-                     "xenial" => "1604",
-                     "wily" => "1510",
-                     "vivid" => "1504",
-                     "utopic" => "1410",
-                     "trusty" => "1404",
-                     "saucy" => "1310",
-                     "raring" => "1304",
-                     "quantal" => "1210",
-                     "precise" => "1204",
-                     "lucid" => "1004", },
+                     "bionic" => "1804", },
         :osx => { "highsierra" => "1013",
                   "sierra" => "1012",
                   "elcapitan" => "1011",
@@ -60,9 +38,6 @@ module Beaker
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
     # * amazon
-    # * huaweios
-    # * cisco_nexus
-    # * cisco_ios_xr
     # * freebsd
     # * openbsd
     # * osx
@@ -80,9 +55,6 @@ module Beaker
     # * solaris
     # * aix
     # * el
-    # * cumulus
-    # * f5
-    # * netscaler
     # * archlinux
     def initialize(name)
       raise ArgumentError, "Unsupported platform name #{name}" if !PLATFORMS.match?(name)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '5.8.1'
+    STRING = '6.0.0'
   end
 end

data/spec/beaker/host/unix/exec_spec.rb

@@ -82,7 +82,7 @@ module Beaker
         let(:ssh_command) { "echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit" }
         let(:ssh_move) { "mv #{directory}/sshd_config.permit /etc/ssh/sshd_config" }
 
-        platforms = PlatformHelpers::SYSTEMDPLATFORMS + PlatformHelpers::DEBIANPLATFORMS + PlatformHelpers::SYSTEMVPLATFORMS
+        platforms = PlatformHelpers::REDHATPLATFORMS + PlatformHelpers::DEBIANPLATFORMS
 
         platforms.each do |platform|
           it "calls the correct commands for #{platform}" do
@@ -106,7 +106,7 @@ module Beaker
     end
 
     describe '#ssh_service_restart' do
-      PlatformHelpers::SYSTEMDPLATFORMS.each do |platform|
+      PlatformHelpers::REDHATPLATFORMS.each do |platform|
         it "calls the correct command for #{platform}" do
           opts['platform'] = platform
           expect(instance).to receive(:exec)
@@ -116,34 +116,18 @@ module Beaker
       end
 
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
-        it "calls the correct command for #{platform}" do
+        it "calls the ssh service restart command for #{platform}" do
           opts['platform'] = platform
           expect(instance).to receive(:exec)
-          expect(Beaker::Command).to receive(:new).with("service ssh restart")
-          expect { instance.ssh_service_restart }.not_to raise_error
-        end
-      end
-
-      PlatformHelpers::SYSTEMVPLATFORMS.each do |platform|
-        it "calls the correct command for #{platform}" do
-          opts['platform'] = "#{platform}-arch"
-          expect(instance).to receive(:exec)
-          expect(Beaker::Command).to receive(:new).with("/sbin/service sshd restart")
+          expect(Beaker::Command).to receive(:new).with("systemctl restart ssh")
           expect { instance.ssh_service_restart }.not_to raise_error
         end
       end
-
-      it 'raises an error on unsupported platforms' do
-        opts['platform'] = 'notarealthing02-parts-arch'
-        expect do
-          instance.ssh_service_restart
-        end.to raise_error(ArgumentError, /#{opts['platform']}/)
-      end
     end
 
     describe '#prepend_commands' do
-      it 'returns the pc parameter unchanged for non-cisco platforms' do
-        allow(instance).to receive(:[]).with(:platform).and_return('notcisco')
+      it 'returns the pc parameter unchanged for all platforms' do
+        allow(instance).to receive(:[]).with(:platform).and_return('unix')
         answer_prepend_commands = 'pc_param_unchanged_13579'
         answer_test = instance.prepend_commands('fake_cmd', answer_prepend_commands)
         expect(answer_test).to be === answer_prepend_commands

data/spec/beaker/host/unix/file_spec.rb

@@ -44,13 +44,6 @@ module Beaker
         @platform = 'debian-6-x86_64'
         expect(instance.repo_type).to be === 'deb'
       end
-
-      it 'errors for all other platform types' do
-        @platform = 'eos-4-x86_64'
-        expect do
-          instance.repo_type
-        end.to raise_error(ArgumentError, /repo\ type\ not\ known/)
-      end
     end
 
     describe '#package_config_dir' do
@@ -75,13 +68,6 @@ module Beaker
         @platform = 'opensuse-15-x86_64'
         expect(instance.package_config_dir).to be === '/etc/zypp/repos.d/'
       end
-
-      it 'errors for all other platform types' do
-        @platform = 'eos-4-x86_64'
-        expect do
-          instance.package_config_dir
-        end.to raise_error(ArgumentError, /package\ config\ dir\ unknown/)
-      end
     end
 
     describe '#repo_filename' do
@@ -142,26 +128,12 @@ module Beaker
       end
 
       it 'builds the filename correctly for debian-based platforms' do
-        @platform = 'debian-8-x86_64'
+        @platform = 'debian-12-x86_64'
         filename = instance.repo_filename('pkg_name', 'pkg_version10')
-        correct = 'pl-pkg_name-pkg_version10-jessie.list'
+        correct = 'pl-pkg_name-pkg_version10-bookworm.list'
         expect(filename).to be === correct
       end
 
-      it 'uses the variant for the codename on the cumulus platform' do
-        @platform = 'cumulus-2.5-x86_64'
-        filename = instance.repo_filename('pkg_name', 'pkg_version11')
-        correct = 'pl-pkg_name-pkg_version11-cumulus.list'
-        expect(filename).to be === correct
-      end
-
-      it 'adds wrlinux to variant on cisco platforms' do
-        @platform = 'cisco_nexus-7-x86_64'
-        allow(instance).to receive(:is_pe?).and_return(false)
-        filename = instance.repo_filename('pkg_name', 'pkg_version12')
-        expect(filename).to match(/sion12\-cisco\-wrlinux\-/)
-      end
-
       it 'errors for non-el or debian-based platforms' do
         @platform = 'freebsd-22-x86_64'
         expect do
@@ -172,7 +144,7 @@ module Beaker
 
     describe '#noask_file_text' do
       it 'errors on non-solaris platforms' do
-        @platform = 'cumulus-4000-x86_64'
+        @platform = 'debian-12-x86_64'
         expect do
           instance.noask_file_text
         end.to raise_error(ArgumentError, /^noask\ file\ text\ unknown/)

data/spec/beaker/host/unix/pkg_spec.rb

@@ -68,14 +68,6 @@ module Beaker
         end
       end
 
-      it "checks correctly on EOS" do
-        @opts = { 'platform' => 'eos-is-me' }
-        pkg = 'eos-package'
-        expect(Beaker::Command).to receive(:new).with("rpm -q #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
-        expect(instance).to receive(:exec).with('', { :accept_all_exit_codes => true }).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.check_for_package(pkg)).to be === true
-      end
-
       it "checks correctly on el-" do
         @opts = { 'platform' => 'el-is-me' }
         pkg = 'el_package'
@@ -84,14 +76,6 @@ module Beaker
         expect(instance.check_for_package(pkg)).to be === true
       end
 
-      it "checks correctly on huaweios" do
-        @opts = { 'platform' => 'huaweios-is-me' }
-        pkg = 'debian_package'
-        expect(Beaker::Command).to receive(:new).with("dpkg -s #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
-        expect(instance).to receive(:exec).with('', { :accept_all_exit_codes => true }).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.check_for_package(pkg)).to be === true
-      end
-
       it "checks correctly on debian" do
         @opts = { 'platform' => 'debian-is-me' }
         pkg = 'debian_package'
@@ -108,14 +92,6 @@ module Beaker
         expect(instance.check_for_package(pkg)).to be === true
       end
 
-      it "checks correctly on cumulus" do
-        @opts = { 'platform' => 'cumulus-is-me' }
-        pkg = 'cumulus_package'
-        expect(Beaker::Command).to receive(:new).with("dpkg -s #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
-        expect(instance).to receive(:exec).with('', { :accept_all_exit_codes => true }).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.check_for_package(pkg)).to be === true
-      end
-
       it "checks correctly on solaris-11" do
         @opts = { 'platform' => 'solaris-11-is-me' }
         pkg = 'solaris-11_package'
@@ -140,12 +116,6 @@ module Beaker
         expect(instance.check_for_package(pkg)).to be === true
       end
 
-      it "returns false for el-4" do
-        @opts = { 'platform' => 'el-4-is-me' }
-        pkg = 'el-4_package'
-        expect(instance.check_for_package(pkg)).to be === false
-      end
-
       it "raises on unknown platform" do
         @opts = { 'platform' => 'nope-is-me' }
         pkg = 'nope_package'
@@ -191,6 +161,14 @@ module Beaker
         expect(instance.install_package(pkg)).to eq "hello"
       end
 
+      it "uses yum on amazon linux 2" do
+        @opts = { 'platform' => "amazon-7-is-me" }
+        pkg = 'amazon_package'
+        expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+        expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+        expect(instance.install_package(pkg)).to eq "hello"
+      end
+
       it "uses pacman on archlinux" do
         @opts = { 'platform' => 'archlinux-is-me' }
         pkg = 'archlinux_package'
@@ -301,6 +279,14 @@ module Beaker
         end
       end
 
+      it 'Amazon Linux 2 uses yum' do
+        @platform = platform
+        @version = '7'
+        package_file = 'test_123.yay'
+        expect(instance).to receive(:execute).with(/^yum.*#{package_file}$/)
+        instance.install_local_package(package_file)
+      end
+
       it 'Centos & EL: uses yum' do
         package_file = 'testing_789.yay'
         %w[centos redhat].each do |platform|
@@ -310,9 +296,9 @@ module Beaker
         end
       end
 
-      it 'Debian, Ubuntu, Cumulus: uses dpkg' do
+      it 'Debian, Ubuntu: uses dpkg' do
         package_file = 'testing_012.yay'
-        %w[debian ubuntu cumulus].each do |platform|
+        %w[debian ubuntu].each do |platform|
           @platform = platform
           expect(instance).to receive(:execute).with(/^dpkg.*#{package_file}$/)
           expect(instance).to receive(:execute).with('apt-get update')
@@ -346,15 +332,6 @@ module Beaker
         allow(instance).to receive(:[]).with('platform') { Beaker::Platform.new("#{platform}-#{version}-x86_64") }
       end
 
-      it 'rejects unsupported platforms' do
-        @platform = 'cisco_nexus'
-        expect do
-          instance.uncompress_local_tarball(tar_file, base_dir, download_file)
-        end.to raise_error(
-          /^Platform #{platform} .* not supported .* uncompress_local_tarball$/,
-        )
-      end
-
       it 'untars the file given' do
         @platform = 'sles'
         expect(instance).to receive(:execute).with(

data/spec/beaker/host/unix_spec.rb

@@ -37,13 +37,5 @@ module Unix
         expect(host.determine_ssh_server).to be === :openssh
       end
     end
-
-    describe '#validate_setup' do
-      it 'does nothing for non cisco_nexus-7 platforms' do
-        @platform = 'el-7-x86_64'
-        validate_test = host.validate_setup
-        expect(validate_test).to be_nil
-      end
-    end
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -40,7 +40,6 @@ describe Beaker do
     end
   end
 
-  it_behaves_like 'enables_root_login', 'f5', []
   # Non-cygwin Windows
   it_behaves_like 'enables_root_login', 'pswindows', [], false
 
@@ -91,20 +90,25 @@ describe Beaker do
     "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
   ]
 
-  %w[debian ubuntu cumulus].each do |deb_like|
+  %w[debian ubuntu].each do |deb_like|
     it_behaves_like 'enables_root_login', deb_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo su -c \"service ssh restart\"",
     ]
   end
 
-  ['centos', 'el-', 'redhat', 'fedora', 'eos'].each do |redhat_like|
+  ['centos', 'el-', 'redhat'].each do |redhat_like|
     it_behaves_like 'enables_root_login', redhat_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo -E /sbin/service sshd reload",
     ]
   end
 
+  it_behaves_like 'enables_root_login', 'fedora', [
+    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+    "sudo -E systemctl restart sshd.service",
+  ]
+
   context 'timesync' do
     subject { dummy_class.new }
 
@@ -236,15 +240,7 @@ describe Beaker do
       subject.apt_get_update(host)
     end
 
-    it "can perform apt-get on cumulus hosts" do
-      host = make_host('testhost', { :platform => 'cumulus' })
-
-      expect(Beaker::Command).to receive(:new).with("apt-get update").once
-
-      subject.apt_get_update(host)
-    end
-
-    it "does nothing on non debian/ubuntu/cumulus hosts" do
+    it "does nothing on non debian/ubuntu hosts" do
       host = make_host('testhost', { :platform => 'windows' })
 
       expect(Beaker::Command).not_to receive(:new)
@@ -277,7 +273,7 @@ describe Beaker do
   context "sync_root_keys" do
     subject { dummy_class.new }
 
-    it "can sync keys on a solaris/eos host" do
+    it "can sync keys on a solaris host" do
       @platform = 'solaris'
 
       expect(Beaker::Command).to receive(:new).with(sync_cmd % "bash").exactly(3).times
@@ -385,12 +381,6 @@ describe Beaker do
 
       subject.validate_host(hosts, options)
     end
-
-    it 'skips validation on cisco hosts' do
-      host = make_host('cisco-7', { stdout: stdout, platform: 'cisco_nexus-7-x86_64' })
-      expect(subject).to receive(:check_and_install_packages_if_needed).with(host, []).once
-      subject.validate_host(host, options)
-    end
   end
 
   context 'get_domain_name' do
@@ -502,8 +492,8 @@ describe Beaker do
 
     proxyurl = "http://192.168.2.100:3128"
 
-    it "can set proxy config on a debian/ubuntu/cumulus host" do
-      host = make_host('name', { :platform => 'cumulus' })
+    it "can set proxy config on a debian/ubuntu host" do
+      host = make_host('name', { :platform => 'debian' })
 
       expect(Beaker::Command).to receive(:new).with("echo 'Acquire::http::Proxy \"#{proxyurl}/\";' >> /etc/apt/apt.conf.d/10proxy").once
       expect(host).to receive(:exec).once
@@ -546,10 +536,6 @@ describe Beaker do
       test_host_ssh_calls('ubuntu')
     end
 
-    it "sets user ssh environment on an sshd-based linux host" do
-      test_host_ssh_calls('eos')
-    end
-
     it "sets user ssh environment on an sles host" do
       test_host_ssh_calls('sles')
     end
@@ -570,52 +556,6 @@ describe Beaker do
       test_host_ssh_calls('windows')
     end
 
-    it "skips an f5 host correctly" do
-      host = make_host('name', {
-                         :platform => 'f5-stuff',
-                         :ssh_env_file => 'ssh_env_file',
-                         :is_cygwin => true,
-                       })
-      opts = {
-        :env1_key => :env1_value,
-        :env2_key => :env2_value,
-      }
-      allow(host).to receive(:skip_set_env?).and_return('f5 say NO')
-
-      expect(subject).to receive(:construct_env).exactly(0).times
-      expect(Beaker::Command).to receive(:new).exactly(0).times
-      expect(host).to receive(:add_env_var).exactly(0).times
-      opts.each_pair do |key, value|
-        expect(host).to receive(:add_env_var).with(key, value).exactly(0).times
-      end
-      expect(host).to receive(:exec).exactly(0).times
-
-      subject.set_env(host, options.merge(opts))
-    end
-
-    it 'skips a cisco host correctly' do
-      host = make_host('name', {
-                         :platform => 'cisco_nexus-7-x86_64',
-                         :ssh_env_file => 'ssh_env_file',
-                         :is_cygwin => true,
-                       })
-      opts = {
-        :env1_key => :env1_value,
-        :env2_key => :env2_value,
-      }
-      allow(host).to receive(:skip_set_env?).and_return('cisco say NO')
-
-      expect(subject).to receive(:construct_env).exactly(0).times
-      expect(Beaker::Command).to receive(:new).exactly(0).times
-      expect(host).to receive(:add_env_var).exactly(0).times
-      opts.each_pair do |key, value|
-        expect(host).to receive(:add_env_var).with(key, value).exactly(0).times
-      end
-      expect(host).to receive(:exec).exactly(0).times
-
-      subject.set_env(host, options.merge(opts))
-    end
-
     def test_host_ssh_calls(platform_name)
       host = make_host('name', {
                          :platform => platform_name,

data/spec/beaker/options/parser_spec.rb

@@ -559,7 +559,6 @@ module Beaker
 
         context "restricts agents" do
           it_behaves_like('a platform supporting only agents', 'windows-version-arch')
-          it_behaves_like('a platform supporting only agents', 'el-4-arch')
         end
 
         context "ssh user" do

data/spec/beaker/platform_spec.rb

@@ -37,23 +37,23 @@ module Beaker
 
       describe "platforms with version and codename" do
         it "intializes both version and codename if given version" do
-          @name = "debian-7-x86_64"
-          expect(platform.version).to eq('7')
-          expect(platform.codename).to eq('wheezy')
+          @name = "debian-12-x86_64"
+          expect(platform.version).to eq('12')
+          expect(platform.codename).to eq('bookworm')
         end
 
         it "intializes both version and codename if given codename" do
-          @name = "debian-wheezy-x86_64"
-          expect(platform.version).to eq('7')
-          expect(platform.codename).to eq('wheezy')
+          @name = "debian-bookworm-x86_64"
+          expect(platform.version).to eq('12')
+          expect(platform.codename).to eq('bookworm')
         end
       end
     end
 
     context 'to_array' do
       it "converts Beaker::Platform object to array of its attribues" do
-        @name = 'debian-7-somethingsomething'
-        expect(platform.to_array).to be === %w[debian 7 somethingsomething wheezy]
+        @name = 'debian-12-somethingsomething'
+        expect(platform.to_array).to be === %w[debian 12 somethingsomething bookworm]
       end
     end
 
@@ -78,16 +78,6 @@ module Beaker
         expect(platform.with_version_codename).to be === 'debian-bullseye-xxx'
       end
 
-      it "can convert debian-7-xxx to debian-wheezy-xxx" do
-        @name = 'debian-7-xxx'
-        expect(platform.with_version_codename).to be === 'debian-wheezy-xxx'
-      end
-
-      it "can convert debian-6-xxx to debian-squeeze-xxx" do
-        @name = 'debian-6-xxx'
-        expect(platform.with_version_codename).to be === 'debian-squeeze-xxx'
-      end
-
       it "can convert ubuntu-2404-xxx to ubuntu-noble-xxx" do
         @name = 'ubuntu-2404-xxx'
         expect(platform.with_version_codename).to be === 'ubuntu-noble-xxx'
@@ -103,26 +93,6 @@ module Beaker
         expect(platform.with_version_codename).to be === 'ubuntu-focal-xxx'
       end
 
-      it "can convert ubuntu-1604-xxx to ubuntu-xenial-xxx" do
-        @name = 'ubuntu-1604-xxx'
-        expect(platform.with_version_codename).to be === 'ubuntu-xenial-xxx'
-      end
-
-      it "can convert ubuntu-1310-xxx to ubuntu-saucy-xxx" do
-        @name = 'ubuntu-1310-xxx'
-        expect(platform.with_version_codename).to be === 'ubuntu-saucy-xxx'
-      end
-
-      it "can convert ubuntu-12.10-xxx to ubuntu-quantal-xxx" do
-        @name = 'ubuntu-12.10-xxx'
-        expect(platform.with_version_codename).to be === 'ubuntu-quantal-xxx'
-      end
-
-      it "can convert ubuntu-10.04-xxx to ubuntu-lucid-xxx" do
-        @name = 'ubuntu-10.04-xxx'
-        expect(platform.with_version_codename).to be === 'ubuntu-lucid-xxx'
-      end
-
       %w[centos redhat].each do |p|
         it "leaves #{p}-7-xxx alone" do
           @name = "#{p}-7-xxx"
@@ -132,24 +102,24 @@ module Beaker
     end
 
     context 'with_version_number' do
-      it "can convert debian-wheezy-xxx to debian-7-xxx" do
-        @name = 'debian-wheezy-xxx'
-        expect(platform.with_version_number).to be === 'debian-7-xxx'
+      it "can convert debian-bookworm-xxx to debian-12-xxx" do
+        @name = 'debian-bookworm-xxx'
+        expect(platform.with_version_number).to be === 'debian-12-xxx'
       end
 
-      it "can convert debian-squeeze-xxx to debian-6-xxx" do
-        @name = 'debian-squeeze-xxx'
-        expect(platform.with_version_number).to be === 'debian-6-xxx'
+      it "can convert debian-bullseye-xxx to debian-11-xxx" do
+        @name = 'debian-bullseye-xxx'
+        expect(platform.with_version_number).to be === 'debian-11-xxx'
       end
 
-      it "can convert ubuntu-saucy-xxx to ubuntu-1310-xxx" do
-        @name = 'ubuntu-saucy-xxx'
-        expect(platform.with_version_number).to be === 'ubuntu-1310-xxx'
+      it "can convert ubuntu-focal-xxx to ubuntu-2004-xxx" do
+        @name = 'ubuntu-focal-xxx'
+        expect(platform.with_version_number).to be === 'ubuntu-2004-xxx'
       end
 
-      it "can convert ubuntu-quantal-xxx to ubuntu-1210-xxx" do
-        @name = 'ubuntu-quantal-xxx'
-        expect(platform.with_version_number).to be === 'ubuntu-1210-xxx'
+      it "can convert ubuntu-jammy-xxx to ubuntu-2204-xxx" do
+        @name = 'ubuntu-jammy-xxx'
+        expect(platform.with_version_number).to be === 'ubuntu-2204-xxx'
       end
 
       %w[centos redhat].each do |p|