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

Merge pull request #334 from eimlav/modules-8234

Browse Source 
(MODULES-8234) - Upgrade Oracle Java version to 8u192
This commit is contained in:
Paula Muir
2018-11-09 15:25:41 +00:00
committed by GitHub
parent 7243839129 68fb4fa498
commit b4bb7f0b89
3 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/oracle.pp
View File

@@ -158,16 +158,16 @@ define java::oracle (
$release_hash = undef $release_hash = undef
} }
'8' : { '8' : {
$release_major = '8u181' $release_major = '8u192'
$release_minor = 'b13' $release_minor = 'b12'
$install_path = "${java_se}1.8.0_181" $install_path = "${java_se}1.8.0_192"
$release_hash = '96a7b8442fe848ef90c96a2fad6ed6d1' $release_hash = '750e1c8617c5452694857ad95c3ee230'
} }
default : { default : {
$release_major = '8u181' $release_major = '8u192'
$release_minor = 'b13' $release_minor = 'b12'
$install_path = "${java_se}1.8.0_181" $install_path = "${java_se}1.8.0_192"
$release_hash = '96a7b8442fe848ef90c96a2fad6ed6d1' $release_hash = '750e1c8617c5452694857ad95c3ee230'
} }
} }
} }

6
spec/acceptance/install_spec.rb
View File

@@ -87,9 +87,9 @@ bogus_alternative = "class { 'java':\n"\
oracle_enabled = false oracle_enabled = false
oracle_version_major = '8' oracle_version_major = '8'
oracle_version_minor = '181' oracle_version_minor = '192'
oracle_version_build = '13' oracle_version_build = '12'
oracle_hash = '96a7b8442fe848ef90c96a2fad6ed6d1' oracle_hash = '750e1c8617c5452694857ad95c3ee230'
install_oracle_jre = <<EOL install_oracle_jre = <<EOL
java::oracle { java::oracle {

93
spec/defines/oracle_spec.rb
View File

@@ -1,6 +1,6 @@
require 'spec_helper' require 'spec_helper'
oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz' oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.tar.gz'
describe 'java::oracle', type: :define do describe 'java::oracle', type: :define do
context 'with CentOS 64-bit' do context 'with CentOS 64-bit' do
@@ -28,9 +28,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u181-linux-x64.rpm') } it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').with_command('rpm --force -iv /tmp/jdk-8u181-linux-x64.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('rpm --force -iv /tmp/jdk-8u192-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').that_requires('Archive[/tmp/jdk-8u181-linux-x64.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-x64.rpm]') }
end end
context 'when Oracle Java SE 6 JRE' do context 'when Oracle Java SE 6 JRE' do
@@ -55,27 +55,27 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jre8' } let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/jre-8u181-linux-x64.rpm') } it { is_expected.to contain_archive('/tmp/jre-8u192-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').with_command('rpm --force -iv /tmp/jre-8u181-linux-x64.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('rpm --force -iv /tmp/jre-8u192-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').that_requires('Archive[/tmp/jre-8u181-linux-x64.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-x64.rpm]') }
end end
context 'when passing URL to url parameter' do context 'when passing URL to url parameter' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u181', version_major: '8u192',
version_minor: 'b13', version_minor: 'b12',
java_se: 'jdk', java_se: 'jdk',
url: 'http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.rpm', url: 'http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm',
url_hash: 'ignored', url_hash: 'ignored',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { it {
is_expected.to contain_archive('/tmp/jdk-8u181-linux-x64.rpm') is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm')
.with_source('http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.rpm') .with_source('http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm')
} }
end end
@@ -83,25 +83,28 @@ describe 'java::oracle', type: :define do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u181', version_major: '8u192',
version_minor: 'b13', version_minor: 'b12',
java_se: 'jdk', java_se: 'jdk',
url_hash: 'abcdef01234567890', url_hash: '750e1c8617c5452694857ad95c3ee230',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u181-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk//8u181-b13/abcdef01234567890/jdk-8u181-linux-x64.rpm') } it {
is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm')
.with_source('http://download.oracle.com/otn-pub/java/jdk//8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm')
}
end end
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u181', version_major: '8u192',
version_minor: 'b13', version_minor: 'b12',
java_se: 'jdk', java_se: 'jdk',
url_hash: '96a7b8442fe848ef90c96a2fad6ed6d1', url_hash: '750e1c8617c5452694857ad95c3ee230',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -111,8 +114,8 @@ describe 'java::oracle', type: :define do
java::oracle { java::oracle {
'jdk8121': 'jdk8121':
ensure => 'present', ensure => 'present',
version_major => '8u131', version_major => '8u121',
version_minor => 'b11', version_minor => 'b13',
java_se => 'jdk', java_se => 'jdk',
url_hash => 'abcdef01234567890', url_hash => 'abcdef01234567890',
} }
@@ -168,9 +171,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u181-linux-i586.rpm') } it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').with_command('rpm --force -iv /tmp/jdk-8u181-linux-i586.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('rpm --force -iv /tmp/jdk-8u192-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').that_requires('Archive[/tmp/jdk-8u181-linux-i586.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-i586.rpm]') }
end end
context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do
@@ -195,19 +198,19 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jre-8u181-linux-i586.rpm') } it { is_expected.to contain_archive('/tmp/jre-8u192-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').with_command('rpm --force -iv /tmp/jre-8u181-linux-i586.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('rpm --force -iv /tmp/jre-8u192-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').that_requires('Archive[/tmp/jre-8u181-linux-i586.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-i586.rpm]') }
end end
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u181', version_major: '8u192',
version_minor: 'b13', version_minor: 'b12',
java_se: 'jdk', java_se: 'jdk',
url_hash: '96a7b8442fe848ef90c96a2fad6ed6d1', url_hash: '750e1c8617c5452694857ad95c3ee230',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -217,8 +220,8 @@ describe 'java::oracle', type: :define do
java::oracle { java::oracle {
'jdk8121': 'jdk8121':
ensure => 'present', ensure => 'present',
version_major => '8u131', version_major => '8u121',
version_minor => 'b11', version_minor => 'b13',
java_se => 'jdk', java_se => 'jdk',
url_hash => 'abcdef01234567890', url_hash => 'abcdef01234567890',
} }
@@ -274,9 +277,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u181-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.tar.gz') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').with_command('tar -zxf /tmp/jdk-8u181-linux-x64.tar.gz -C /usr/lib/jvm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('tar -zxf /tmp/jdk-8u192-linux-x64.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u181 b13').that_requires('Archive[/tmp/jdk-8u181-linux-x64.tar.gz]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-x64.tar.gz]') }
end end
context 'with Oracle Java SE 6 JRE' do context 'with Oracle Java SE 6 JRE' do
@@ -301,26 +304,26 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jre8' } let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/jre-8u181-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jre-8u192-linux-x64.tar.gz') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').with_command('tar -zxf /tmp/jre-8u181-linux-x64.tar.gz -C /usr/lib/jvm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('tar -zxf /tmp/jre-8u192-linux-x64.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u181 b13').that_requires('Archive[/tmp/jre-8u181-linux-x64.tar.gz]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-x64.tar.gz]') }
end end
context 'when passing URL to url parameter' do context 'when passing URL to url parameter' do
let(:params) { { ensure: 'present', version_major: '8u181', version_minor: 'b13', java_se: 'jdk', url: oracle_url.to_s } } let(:params) { { ensure: 'present', version_major: '8u192', version_minor: 'b12', java_se: 'jdk', url: oracle_url.to_s } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u181-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.tar.gz') }
end end
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u181', version_major: '8u192',
version_minor: 'b13', version_minor: 'b12',
java_se: 'jdk', java_se: 'jdk',
url_hash: '96a7b8442fe848ef90c96a2fad6ed6d1', url_hash: '750e1c8617c5452694857ad95c3ee230',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -330,8 +333,8 @@ describe 'java::oracle', type: :define do
java::oracle { java::oracle {
'jdk8121': 'jdk8121':
ensure => 'present', ensure => 'present',
version_major => '8u131', version_major => '8u121',
version_minor => 'b11', version_minor => 'b13',
java_se => 'jdk', java_se => 'jdk',
url_hash => 'abcdef01234567890', url_hash => 'abcdef01234567890',
} }