From db0838f696d8f47fa075d0822180def38993b27c Mon Sep 17 00:00:00 2001 From: David Swan Date: Tue, 12 Feb 2019 17:31:02 +0000 Subject: [PATCH] (FM-7811) - Use postgresql 9.4 for SLES 11 sp4 Also enabling SLES testing --- manifests/globals.pp | 3 ++- spec/acceptance/z_alternative_pgdata_spec.rb | 6 ++++++ spec/spec_helper_acceptance.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/manifests/globals.pp b/manifests/globals.pp index 27781f3491..82e8e81b14 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -116,7 +116,8 @@ }, 'Suse' => $::operatingsystem ? { 'SLES' => $::operatingsystemrelease ? { - /11\.[0-4]/ => '91', + /11\.[0-3]/ => '91', + /11\.4/ => '94', /12\.0/ => '93', /12\.[1-2]/ => '94', default => '96', diff --git a/spec/acceptance/z_alternative_pgdata_spec.rb b/spec/acceptance/z_alternative_pgdata_spec.rb index b893630982..f0a8eafbdf 100644 --- a/spec/acceptance/z_alternative_pgdata_spec.rb +++ b/spec/acceptance/z_alternative_pgdata_spec.rb @@ -9,6 +9,12 @@ end describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do + before(:each) do + if fact('osfamily') == 'Suse' + skip "These test's currently do not work on SLES/Suse modules" + end + end + it 'on an alternative pgdata location' do pp = <<-MAIFEST #file { '/var/lib/pgsql': ensure => directory, } -> diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 52d32b141d..6444a06646 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -11,7 +11,7 @@ configure_type_defaults_on(hosts) install_ca_certs unless pe_install? -UNSUPPORTED_PLATFORMS = ['AIX', 'windows', 'Solaris', 'Suse'].freeze +UNSUPPORTED_PLATFORMS = ['AIX', 'windows', 'Solaris'].freeze install_bolt_on(hosts) unless pe_install? install_module_on(hosts)