Skip to content

Commit c2806e9

Browse files
authored
Merge pull request #1371 from puppetlabs/pdksync_CONT-189/remove_os_support
pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6
2 parents 65f4441 + 1031e2d commit c2806e9

File tree

4 files changed

+2
-31
lines changed

4 files changed

+2
-31
lines changed

metadata.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
{
2626
"operatingsystem": "RedHat",
2727
"operatingsystemrelease": [
28-
"6",
2928
"7",
3029
"8",
3130
"9"
@@ -41,14 +40,12 @@
4140
{
4241
"operatingsystem": "OracleLinux",
4342
"operatingsystemrelease": [
44-
"6",
4543
"7"
4644
]
4745
},
4846
{
4947
"operatingsystem": "Scientific",
5048
"operatingsystemrelease": [
51-
"6",
5249
"7"
5350
]
5451
},

spec/classes/lib/devel_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
end
2727

2828
describe 'should not link pg_config on RedHat with default version' do
29-
include_examples 'RedHat 6'
29+
include_examples 'RedHat 8'
3030

3131
it { is_expected.not_to contain_file('/usr/bin/pg_config') }
3232
end
3333

3434
describe 'link pg_config on RedHat with non-default version' do
35-
include_examples 'RedHat 6'
35+
include_examples 'RedHat 8'
3636
let :pre_condition do
3737
"class { '::postgresql::globals': version => '9.3' }"
3838
end

spec/defines/server/config_entry_spec.rb

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@
2424
context 'ports' do
2525
let(:params) { { ensure: 'present', name: 'port_spec', value: '5432' } }
2626

27-
context 'redhat 6' do
28-
include_examples 'RedHat 6'
29-
30-
it 'stops postgresql and changes the port #exec' do
31-
is_expected.to contain_exec('postgresql_stop_port')
32-
end
33-
it 'stops postgresql and changes the port #augeas' do
34-
is_expected.to contain_augeas('override PGPORT in /etc/sysconfig/pgsql/postgresql')
35-
end
36-
end
3727
context 'redhat 7' do
3828
include_examples 'RedHat 7'
3929

@@ -43,18 +33,6 @@
4333
end
4434
end
4535

46-
context 'data_directory' do
47-
include_examples 'RedHat 6'
48-
let(:params) { { ensure: 'present', name: 'data_directory_spec', value: '/var/pgsql' } }
49-
50-
it 'stops postgresql and changes the data directory #exec' do
51-
is_expected.to contain_exec('postgresql_data_directory')
52-
end
53-
it 'stops postgresql and changes the data directory #augeas' do
54-
is_expected.to contain_augeas('override PGDATA in /etc/sysconfig/pgsql/postgresql')
55-
end
56-
end
57-
5836
context 'passes values through appropriately' do
5937
let(:params) { { ensure: 'present', name: 'check_function_bodies', value: 'off' } }
6038

spec/spec_helper_local.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ def param(type, title, param)
138138
let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
139139
end
140140

141-
shared_context 'RedHat 6' do
142-
let(:facts) { on_supported_os['redhat-6-x86_64'] }
143-
end
144-
145141
shared_context 'RedHat 7' do
146142
let(:facts) { on_supported_os['redhat-7-x86_64'] }
147143
end

0 commit comments

Comments
 (0)