From 0a635ea0be0265ccc6b833d68b984182b4c37ea0 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Wed, 22 Nov 2023 14:40:37 -0800 Subject: [PATCH] Default to DNF for Fedora Prior to this commit, the install and uninstall methods for Fedora defaulted to using DNF as its package manager for versions greater than or equal to 22 but less than 40, and Yum for every other version. This commit configures Beaker to use DNF for every version of Fedora, as DNF has been the default package manager for Fedora for the last 8 years. --- lib/beaker/host/unix/pkg.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/beaker/host/unix/pkg.rb b/lib/beaker/host/unix/pkg.rb index 987906b36..192c66ee6 100644 --- a/lib/beaker/host/unix/pkg.rb +++ b/lib/beaker/host/unix/pkg.rb @@ -87,10 +87,10 @@ def install_package(name, cmdline_args = '', version = nil, opts = {}) execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts) when /el-4/ @logger.debug("Package installation not supported on rhel4") - when /amazon-2023|el-(8|9|1[0-9])|fedora-(2[2-9]|3[0-9])/ + when /amazon-2023|el-(8|9|1[0-9])|fedora/ name = "#{name}-#{version}" if version execute("dnf -y #{cmdline_args} install #{name}", opts) - when /cisco|fedora|centos|redhat|eos|el-[1-7]-/ + when /cisco|centos|redhat|eos|el-[1-7]-/ name = "#{name}-#{version}" if version execute("yum -y #{cmdline_args} install #{name}", opts) when /ubuntu|debian|cumulus|huaweios/ @@ -172,9 +172,9 @@ def uninstall_package(name, cmdline_args = '', opts = {}) execute("zypper --non-interactive rm #{name}", opts) when /el-4/ @logger.debug("Package uninstallation not supported on rhel4") - when /amazon-2023|el-(8|9|1[0-9])|fedora-(2[2-9]|3[0-9])/ + when /amazon-2023|el-(8|9|1[0-9])|fedora/ execute("dnf -y #{cmdline_args} remove #{name}", opts) - when /cisco|fedora|centos|redhat|eos|el-[1-7]-/ + when /cisco|centos|redhat|eos|el-[1-7]-/ execute("yum -y #{cmdline_args} remove #{name}", opts) when /ubuntu|debian|cumulus|huaweios/ execute("apt-get purge #{cmdline_args} -y #{name}", opts)