Skip to content

pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6 #1371

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 4 commits into from
Oct 7, 2022
Merged

pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6 #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32b770f
(CONT-189) Remove support for RedHat6
david22swan Oct 7, 2022
f5cbfac
(CONT-189) Remove support for OracleLinux6
david22swan Oct 7, 2022
c14aa2b
(CONT-189) Remove support for Scientific6
david22swan Oct 7, 2022
1031e2d
(CONT-189) Remove RHEL 6 from Spec tests
david22swan Oct 7, 2022
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
3 changes: 0 additions & 3 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7",
"8",
"9"
Expand All @@ -41,14 +40,12 @@
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"6",
"7"
]
},
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/lib/devel_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
end

describe 'should not link pg_config on RedHat with default version' do
include_examples 'RedHat 6'
include_examples 'RedHat 8'

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

describe 'link pg_config on RedHat with non-default version' do
include_examples 'RedHat 6'
include_examples 'RedHat 8'
let :pre_condition do
"class { '::postgresql::globals': version => '9.3' }"
end
Expand Down
22 changes: 0 additions & 22 deletions spec/defines/server/config_entry_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@
context 'ports' do
let(:params) { { ensure: 'present', name: 'port_spec', value: '5432' } }

context 'redhat 6' do
include_examples 'RedHat 6'

it 'stops postgresql and changes the port #exec' do
is_expected.to contain_exec('postgresql_stop_port')
end
it 'stops postgresql and changes the port #augeas' do
is_expected.to contain_augeas('override PGPORT in /etc/sysconfig/pgsql/postgresql')
end
end
context 'redhat 7' do
include_examples 'RedHat 7'

Expand All @@ -43,18 +33,6 @@
end
end

context 'data_directory' do
include_examples 'RedHat 6'
let(:params) { { ensure: 'present', name: 'data_directory_spec', value: '/var/pgsql' } }

it 'stops postgresql and changes the data directory #exec' do
is_expected.to contain_exec('postgresql_data_directory')
end
it 'stops postgresql and changes the data directory #augeas' do
is_expected.to contain_augeas('override PGDATA in /etc/sysconfig/pgsql/postgresql')
end
end

context 'passes values through appropriately' do
let(:params) { { ensure: 'present', name: 'check_function_bodies', value: 'off' } }

Expand Down
4 changes: 0 additions & 4 deletions spec/spec_helper_local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ def param(type, title, param)
let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
end

shared_context 'RedHat 6' do
let(:facts) { on_supported_os['redhat-6-x86_64'] }
end

shared_context 'RedHat 7' do
let(:facts) { on_supported_os['redhat-7-x86_64'] }
end
Expand Down