Skip to content
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

Jump to bottom

(PA-6276) Update puppet_agent module task acceptance for AL2 #721

Merged
merged 1 commit into from
Jun 7, 2024
Merged

(PA-6276) Update puppet_agent module task acceptance for AL2 #721

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
3 changes: 2 additions & 1 deletion task_spec/spec/acceptance/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def latest_platform_list
el-9-aarch64|
ubuntu-22\.04-aarch64|
amazon-2023|
amazon-2|
osx-14|
debian-12|
debian-11-aarch64|
Expand Down Expand Up @@ -104,7 +105,7 @@ def latest_platform_list
# true
# end
multiple_puppet7_versions = case target_platform
when %r{osx-13|osx-14|el-9-aarch64|debian-11-aarch64|el-9-ppc64le}
when %r{osx-13|osx-14|el-9-aarch64|debian-11-aarch64|el-9-ppc64le|amazon-2}
false
else
true
Expand Down
4 changes: 2 additions & 2 deletions tasks/install_shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ case $platform in
;;
"Amzn"|"Amazon Linux")
case $platform_version in
"2") platform_version="7";;
"2") platform_version="2";;
esac
;;
esac
Expand Down Expand Up @@ -663,7 +663,7 @@ case $platform in
filetype="rpm"
platform_package="el"
# For Amazon Linux 2023 and onwards we can use the 'amazon' packages created instead of 'el' packages
if (( $platform_version >= 2023 )); then
if (( $platform_version == 2023 || $platform_version == 2 )); then
platform_package="amazon"
fi
filename="${collection}-release-${platform_package}-${platform_version}.noarch.rpm"
Expand Down
Loading