Merge pull request #659 from skyamgarp/PA-5309

(PA-5309) Add macOS 13 (ARM) to the puppet_agent module task
puppetlabs · Aug 14, 2023 · ecfdc2b · ecfdc2b
2 parents 7a4eb58 + 442e295
commit ecfdc2b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/task_spec/spec/acceptance/init_spec.rb b/task_spec/spec/acceptance/init_spec.rb
@@ -54,6 +54,8 @@ def log_output_errors(result)
                          '7.7.0'
                        when %r{osx-12}, %r{ubuntu-22.04}
                          '7.18.0'
+                       when %r{osx-13}
+                         'latest'
                        else
                          '7.18.0'
                        end
@@ -65,9 +67,15 @@ def log_output_errors(result)
     #   puppet_7_collection = 'puppet7-nightly'
     #   puppet_8_collection = 'puppet8-nightly'
     # else
-    puppet_7_collection = 'puppet7'
-    puppet_8_collection = 'puppet8'
     # end
+    case target_platform
+    when %r{osx-13}
+      puppet_7_collection = 'puppet7-nightly'
+      puppet_8_collection = 'puppet8-nightly'
+    else
+      puppet_7_collection = 'puppet7'
+      puppet_8_collection = 'puppet8'
+    end
 
     # We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
     # have supported a given platform. Once a platform has been supported
@@ -78,7 +86,12 @@ def log_output_errors(result)
     #                             else
     #                               true
     #                             end
-    multiple_puppet7_versions = true
+    multiple_puppet7_versions = case target_platform
+                                when %r{osx-13}
+                                  false
+                                else
+                                  true
+                                end
 
     # extra request is needed on windows hosts
     # this will fail with "execution expired"

diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh
@@ -233,6 +233,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
     case $major_version in
       "11")    platform_version="11";;
       "12")    platform_version="12";;
+      "13")    platform_version="13";;
       *) echo "No builds for platform: $major_version"
          exit 1
          ;;