Skip to content

(PA-5309) Add macOS 13 (ARM) to the puppet_agent module task #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2023
Merged

(PA-5309) Add macOS 13 (ARM) to the puppet_agent module task #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions task_spec/spec/acceptance/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions tasks/install_shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down