Skip to content

Commit 442e295

Browse files
committed
(PA-5309) Add macOS 13 (ARM) to the puppet_agent module task
1 parent 7a4eb58 commit 442e295

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

task_spec/spec/acceptance/init_spec.rb

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ def log_output_errors(result)
5454
'7.7.0'
5555
when %r{osx-12}, %r{ubuntu-22.04}
5656
'7.18.0'
57+
when %r{osx-13}
58+
'latest'
5759
else
5860
'7.18.0'
5961
end
@@ -65,9 +67,15 @@ def log_output_errors(result)
6567
# puppet_7_collection = 'puppet7-nightly'
6668
# puppet_8_collection = 'puppet8-nightly'
6769
# else
68-
puppet_7_collection = 'puppet7'
69-
puppet_8_collection = 'puppet8'
7070
# end
71+
case target_platform
72+
when %r{osx-13}
73+
puppet_7_collection = 'puppet7-nightly'
74+
puppet_8_collection = 'puppet8-nightly'
75+
else
76+
puppet_7_collection = 'puppet7'
77+
puppet_8_collection = 'puppet8'
78+
end
7179

7280
# We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
7381
# have supported a given platform. Once a platform has been supported
@@ -78,7 +86,12 @@ def log_output_errors(result)
7886
# else
7987
# true
8088
# end
81-
multiple_puppet7_versions = true
89+
multiple_puppet7_versions = case target_platform
90+
when %r{osx-13}
91+
false
92+
else
93+
true
94+
end
8295

8396
# extra request is needed on windows hosts
8497
# this will fail with "execution expired"

tasks/install_shell.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
233233
case $major_version in
234234
"11") platform_version="11";;
235235
"12") platform_version="12";;
236+
"13") platform_version="13";;
236237
*) echo "No builds for platform: $major_version"
237238
exit 1
238239
;;

0 commit comments

Comments
 (0)