Skip to content

Commit bf467db

Browse files
committed
(PA-6276) Update puppet_agent module task acceptance for AL2
1 parent c4999d4 commit bf467db

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

task_spec/spec/acceptance/init_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def latest_platform_list
4646
el-9-aarch64|
4747
ubuntu-22\.04-aarch64|
4848
amazon-2023|
49+
amazon-2|
4950
osx-14|
5051
debian-12|
5152
debian-11-aarch64|
@@ -104,7 +105,7 @@ def latest_platform_list
104105
# true
105106
# end
106107
multiple_puppet7_versions = case target_platform
107-
when %r{osx-13|osx-14|el-9-aarch64|debian-11-aarch64|el-9-ppc64le}
108+
when %r{osx-13|osx-14|el-9-aarch64|debian-11-aarch64|el-9-ppc64le|amazon-2}
108109
false
109110
else
110111
true

tasks/install_shell.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ case $platform in
286286
;;
287287
"Amzn"|"Amazon Linux")
288288
case $platform_version in
289-
"2") platform_version="7";;
289+
"2") platform_version="2";;
290290
esac
291291
;;
292292
esac
@@ -663,7 +663,7 @@ case $platform in
663663
filetype="rpm"
664664
platform_package="el"
665665
# For Amazon Linux 2023 and onwards we can use the 'amazon' packages created instead of 'el' packages
666-
if (( $platform_version >= 2023 )); then
666+
if (( $platform_version == 2023 || $platform_version == 2 )); then
667667
platform_package="amazon"
668668
fi
669669
filename="${collection}-release-${platform_package}-${platform_version}.noarch.rpm"

0 commit comments

Comments
 (0)