diff --git a/task_spec/spec/acceptance/init_spec.rb b/task_spec/spec/acceptance/init_spec.rb index 87dc8f22..6c92b40a 100644 --- a/task_spec/spec/acceptance/init_spec.rb +++ b/task_spec/spec/acceptance/init_spec.rb @@ -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| @@ -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 diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh index 3750f374..e25b68cb 100644 --- a/tasks/install_shell.sh +++ b/tasks/install_shell.sh @@ -286,7 +286,7 @@ case $platform in ;; "Amzn"|"Amazon Linux") case $platform_version in - "2") platform_version="7";; + "2") platform_version="2";; esac ;; esac @@ -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"