Merge pull request #690 from shubhamshinde360/PA-5581

(PA-5581) Add Amazon Linux 2023 (Intel and ARM) to the puppet_agent m…
puppetlabs · Dec 13, 2023 · d86ca64 · d86ca64
2 parents 18a8090 + 7bf9e0b
commit d86ca64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/task_spec/spec/acceptance/init_spec.rb b/task_spec/spec/acceptance/init_spec.rb
@@ -56,7 +56,7 @@ def log_output_errors(result)
                          '7.18.0'
                        when %r{osx-13}
                          '7.26.0'
-                       when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}
+                       when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64}
                          'latest'
                        else
                          '7.18.0'
@@ -71,7 +71,7 @@ def log_output_errors(result)
     # else
     # end
     case target_platform
-    when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}
+    when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64}
       puppet_7_collection = 'puppet7-nightly'
       puppet_8_collection = 'puppet8-nightly'
     else

diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh
@@ -601,7 +601,12 @@ case $platform in
   "Amzn"|"Amazon Linux")
     info "Amazon platform! Lets get you an RPM..."
     filetype="rpm"
-    filename="${collection}-release-el-${platform_version}.noarch.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
+      platform_package="amazon"
+    fi
+    filename="${collection}-release-${platform_package}-${platform_version}.noarch.rpm"
     download_url="${yum_source}/${filename}"
     ;;
   "Fedora")