[PA-5938] Removed changes which were not required in 4.x

voxpupuli · Nov 9, 2023 · 03a76bc · 03a76bc
1 parent 57bedbf
commit 03a76bc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/lib/beaker/host/unix/exec.rb b/lib/beaker/host/unix/exec.rb
@@ -280,7 +280,7 @@ def ssh_service_restart
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /amazon|(el|centos|redhat|oracle|scientific)-[7-9]|eos-7|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
+    when /amazon|el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))

diff --git a/lib/beaker/host/unix/pkg.rb b/lib/beaker/host/unix/pkg.rb
@@ -183,7 +183,7 @@ 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|edora-(2[2-9]|3[0-9])/
+    when /amazon|fedora-(2[2-9]|3[0-9])/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
     when /cisco|fedora|centos|redhat|eos|el-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)

diff --git a/lib/beaker/host_prebuilt_steps.rb b/lib/beaker/host_prebuilt_steps.rb
@@ -527,9 +527,6 @@ def package_proxy host, opts
           host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
         when /amazon/, /^el-/, /centos/, /fedora/, /redhat/, /eos/
           host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
-        when /solaris-11/
-          host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))
-          host.exec(Command.new("/usr/bin/pkg set-publisher -g %s solaris" % opts[:package_proxy]))
         else
           logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
         end