RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Update OpenJDK packages to 1.8.0 for SLES 12 service packs

Browse Source
This commit is contained in:
Hailey Martin
2017-05-15 20:37:26 +10:00
parent fcf3ac3476
commit b25212a04e
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.markdown
View File

@@ -170,7 +170,7 @@ OpenJDK is supported on:
* Debian 6, 7 * Debian 6, 7
* Ubuntu 10.04, 12.04, 14.04 * Ubuntu 10.04, 12.04, 14.04
* Solaris 11 * Solaris 11
* SLES 11 SP1, 12 * SLES 11 SP1, SP2, SP3, SP4; SLES 12, SP1, SP2
* OpenBSD 5.6, 5.7 * OpenBSD 5.6, 5.7
Sun Java is supported on: Sun Java is supported on:

6
manifests/params.pp
View File

@@ -211,7 +211,11 @@ class java::params {
'Suse': { 'Suse': {
case $::operatingsystem { case $::operatingsystem {
'SLES': { 'SLES': {
if (versioncmp($::operatingsystemrelease, '12') >= 0) { if (versioncmp($::operatingsystemrelease, '12.1') >= 0) {
$jdk_package = 'java-1_8_0-openjdk-devel'
$jre_package = 'java-1_8_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
} elsif (versioncmp($::operatingsystemrelease, '12') >= 0) {
$jdk_package = 'java-1_7_0-openjdk-devel' $jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk' $jre_package = 'java-1_7_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/' $java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'

7
metadata.json
View File

@@ -67,7 +67,12 @@
"operatingsystem": "SLES", "operatingsystem": "SLES",
"operatingsystemrelease": [ "operatingsystemrelease": [
"11 SP1", "11 SP1",
"12" "11 SP2",
"11 SP3",
"11 SP4",
"12",
"12 SP1",
"12 SP2"
] ]
}, },
{ {

10
spec/classes/java_spec.rb
View File

@@ -221,12 +221,18 @@ describe 'java', :type => :class do
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.0-ibm-1.7.0/') }
end end
context 'select default for SLES 12.1' do context 'select default for SLES 12.0' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}} let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.0', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')} it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
end end
context 'select default for SLES 12.1' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
it { should contain_package('java').with_name('java-1_8_0-openjdk-devel')}
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
end
context 'select jdk for OpenBSD' do context 'select jdk for OpenBSD' do
let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} } let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} }
it { is_expected.to contain_package('java').with_name('jdk') } it { is_expected.to contain_package('java').with_name('jdk') }