Skip to content

Commit 1050082

Browse files
authored
Merge pull request #842 from puppetlabs/PA-8924/main/remove-macos-13
(PA-8924) Remove macOS 11, 12, and 13 support
2 parents b7bfd8e + 69a517e commit 1050082

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

spec/classes/puppet_agent_osfamily_darwin_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
let(:params) { { package_version: } }
3838

3939
context 'when running a supported macOS' do
40-
['osx-11-x86_64', 'osx-12-x86_64'].each do |tag|
40+
['osx-14-x86_64', 'osx-15-x86_64'].each do |tag|
4141
context "on #{tag} with no aio_version" do
4242
let(:osmajor) { tag.split('-')[1] }
4343

@@ -97,29 +97,29 @@
9797
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx10.13.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-10.13-x86_64/puppet-agent-5.10.200-1.osx10.13.dmg') }
9898
end
9999

100-
describe 'when using package_version auto with macOS 11 (two numbers version productversion)' do
100+
describe 'when using package_version auto with macOS 14 (two numbers version productversion)' do
101101
let(:params) do
102102
{
103103
package_version: 'auto',
104104
}
105105
end
106106
let(:facts) do
107-
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11.2', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
107+
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '14.2', }, }, }, platform_tag: 'osx-14-x86_64', serverversion: '5.10.200')
108108
end
109109

110-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
110+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx14.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-14-x86_64/puppet-agent-5.10.200-1.osx14.dmg') }
111111
end
112112

113-
describe 'when using package_version auto with macOS 11 (one number version productversion)' do
113+
describe 'when using package_version auto with macOS 14 (one number version productversion)' do
114114
let(:params) do
115115
{
116116
package_version: 'auto',
117117
}
118118
end
119119
let(:facts) do
120-
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
120+
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '14', }, }, }, platform_tag: 'osx-14-x86_64', serverversion: '5.10.200')
121121
end
122122

123-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
123+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx14.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-14-x86_64/puppet-agent-5.10.200-1.osx14.dmg') }
124124
end
125125
end

tasks/install_shell.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
275275
major_version=$(echo "${major_version}" | cut -d '.' -f 1);
276276

277277
case $major_version in
278-
"11") platform_version="11";;
279-
"12") platform_version="12";;
280-
"13") platform_version="13";;
281278
"14") platform_version="14";;
282279
"15") platform_version="15";;
283280
"26") platform_version="26";;

0 commit comments

Comments
 (0)