Skip to content

Commit

Permalink
Add Amazon 2
Browse files Browse the repository at this point in the history
Copies Amazon 7 to 2, as the former is an implementation detail and the
latter is the actual OS version: https://aws.amazon.com/amazon-linux-2
  • Loading branch information
joshcooper committed Jun 3, 2024
1 parent bae9b51 commit c4b6f60
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/beaker/host/unix/pkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def install_package(name, cmdline_args = '', version = nil, opts = {})
when /amazon-2023|el-(8|9|1[0-9])|fedora/
name = "#{name}-#{version}" if version
execute("dnf -y #{cmdline_args} install #{name}", opts)
when /amazon-7|centos|redhat|el-[1-7]-/
when /amazon-(2|7)|centos|redhat|el-[1-7]-/
name = "#{name}-#{version}" if version
execute("yum -y #{cmdline_args} install #{name}", opts)
when /ubuntu|debian/
Expand Down Expand Up @@ -167,7 +167,7 @@ def uninstall_package(name, cmdline_args = '', opts = {})
execute("zypper --non-interactive rm #{name}", opts)
when /amazon-2023|el-(8|9|1[0-9])|fedora/
execute("dnf -y #{cmdline_args} remove #{name}", opts)
when /amazon-7|centos|redhat|el-[1-7]-/
when /amazon-(2|7)|centos|redhat|el-[1-7]-/
execute("yum -y #{cmdline_args} remove #{name}", opts)
when /ubuntu|debian/
execute("apt-get purge #{cmdline_args} -y #{name}", opts)
Expand Down
12 changes: 10 additions & 2 deletions spec/beaker/host/unix/pkg_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,22 @@ def exec
expect(instance.install_package(pkg)).to eq "hello"
end

it "uses yum on amazon linux 2" do
it "uses yum on misnamed amazon linux 7" 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 yum on amazon linux 2" do
@opts = { 'platform' => "amazon-2-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'
Expand Down Expand Up @@ -281,7 +289,7 @@ def exec

it 'Amazon Linux 2 uses yum' do
@platform = platform
@version = '7'
@version = '2'
package_file = 'test_123.yay'
expect(instance).to receive(:execute).with(/^yum.*#{package_file}$/)
instance.install_local_package(package_file)
Expand Down
1 change: 1 addition & 0 deletions spec/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ module PlatformHelpers

REDHATPLATFORMS = %w[
amazon-2023
amazon-2
fedora
el-
centos
Expand Down

0 comments on commit c4b6f60

Please sign in to comment.