From 2b5add409accdb9f710fb8976118a5102814f2e6 Mon Sep 17 00:00:00 2001 From: Maqsood Ahmad Date: Tue, 19 Dec 2023 16:30:26 +0530 Subject: [PATCH] (PA-5893) Update the task acceptance tests for macOS 14 (Intel) --- task_spec/spec/acceptance/init_spec.rb | 6 +++--- tasks/install_shell.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/task_spec/spec/acceptance/init_spec.rb b/task_spec/spec/acceptance/init_spec.rb index 67650ef7..26558e22 100644 --- 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}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64} + when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64}, %r{osx-14} '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}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64} + when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}, %r{amazon-2023-x86_64}, %r{amazon-2023-aarch64}, %r{osx-14} puppet_7_collection = 'puppet7-nightly' puppet_8_collection = 'puppet8-nightly' else @@ -89,7 +89,7 @@ def log_output_errors(result) # true # end multiple_puppet7_versions = case target_platform - when %r{osx-13|el-9-aarch64} + when %r{osx-13|osx-14|el-9-aarch64} false else true diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh index 7a71a6d8..79586792 100644 --- a/tasks/install_shell.sh +++ b/tasks/install_shell.sh @@ -234,6 +234,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then "11") platform_version="11";; "12") platform_version="12";; "13") platform_version="13";; + "14") platform_version="14";; *) echo "No builds for platform: $major_version" exit 1 ;;