From 697c1911f91756da5ce77506d7e8ba4602d56f5c Mon Sep 17 00:00:00 2001 From: mirespace <35487509+mirespace@users.noreply.github.com> Date: Tue, 16 Jan 2018 11:14:51 +0100 Subject: [PATCH 1/2] $java_home for SLES 11.4 Fixed java_home for matching package to be installed --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 1a29fea..e302bca 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -224,7 +224,7 @@ class java::params { } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) { $jdk_package = 'java-1_7_1-ibm-devel' $jre_package = 'java-1_7_1-ibm' - $java_home = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/' + $java_home = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/' } else { $jdk_package = 'java-1_6_0-ibm-devel' $jre_package = 'java-1_6_0-ibm' From 85c17ef66f87e69b7a9f25df808fb8b9e2013168 Mon Sep 17 00:00:00 2001 From: Helen Campbell Date: Tue, 23 Jan 2018 09:55:13 +0000 Subject: [PATCH 2/2] Fixes the tests for SLES java_home location --- spec/classes/java_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 69bd23f..af97606 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -248,7 +248,7 @@ describe 'java', type: :class do let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } } it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') } - it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') } end context 'when select default for SLES 12.0' do