Skip to content

[PE-37297]: Added support for amazon 2023 in redhat.pp manifest file #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2024
Merged

[PE-37297]: Added support for amazon 2023 in redhat.pp manifest file #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || 'https://gith
gem "beaker-docker", *location_for(ENV['BEAKER_DOCKER_VERSION'] || '~> 0')
gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || '~> 0')
gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1')
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1')
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 2')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0')
15 changes: 10 additions & 5 deletions manifests/osfamily/redhat.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@
$platform_and_version = "fedora/${facts['os']['release']['major']}"
}
'Amazon': {
if ("${facts['os']['release']['major']}" == '2') {
$amz_el_version = '7'
} else {
$amz_el_version = '6'
$major_version = $facts['os']['release']['major']
$amz_el_version = "${major_version}" ? {
'2' => '7',
/^(2017|2018)$/ => '6',
default => $major_version,
}

$platform_and_version = "${amz_el_version}" ? {
/^(6|7)$/ => "el/${amz_el_version}",
default => "amazon/${amz_el_version}",
}
$platform_and_version = "el/${amz_el_version}"
}
default: {
$platform_and_version = "el/${facts['os']['release']['major']}"
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/puppet_agent_osfamily_redhat_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
end

[['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do |os, urlbit, osmajor|
[['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'el/7', 2], ['Amazon', 'amazon/2023', 2023]].each do |os, urlbit, osmajor|
context "with #{os} and #{urlbit}" do
let(:facts) do
override_facts(super(), os: { name: os, release: { major: osmajor, }, })
Expand Down