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

Merge pull request #443 from daianamezdrea/main

Browse Source 
[IAC-1208] - Add the good links for solving the 404 error and exclude sles
This commit is contained in:
sanfrancrisko
2020-10-26 10:18:35 +00:00
committed by GitHub
parent 11dc1f4c26 f90756d87c
commit 3358b47dc7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/sap.pp
View File

@@ -70,13 +70,13 @@ define java::sap (
# use default versions if full version parameter is not provided
case $version {
'7' : {
$_version_full = '7.1.070'
$_version_full = '7.1.072'
if ($java != 'jdk') {
fail('java parameter is not jdk. jre is not supported on version 7')
}
}
'8' : {
$_version_full = '8.1.063'
$_version_full = '8.1.065'
if ($java != 'jdk') {
fail('java parameter is not jdk. jre is not supported on version 8')
}
@@ -140,7 +140,7 @@ define java::sap (
}
# download links look like this (examples):
# https://tools.hana.ondemand.com/additional/sapjvm-8.1.063-linux-x64.zip
# https://tools.hana.ondemand.com/additional/sapjvm-8.1.065-linux-x64.zip
# https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz
# https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz
# https://github.com/SAP/SapMachine/releases/download/sapmachine-14.0.1/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz

6
spec/acceptance/install_spec.rb
View File

@@ -140,9 +140,9 @@ EOL
sap_enabled = true
sap_version7 = '7'
sap_version7_full = '7.1.070'
sap_version7_full = '7.1.072'
sap_version8 = '8'
sap_version8_full = '8.1.063'
sap_version8_full = '8.1.065'
sap_version11 = '11'
sap_version11_full = '11.0.7'
sap_version14 = '14'
@@ -269,7 +269,7 @@ context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?
end
end
context 'java::adopt', if: sap_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
context 'java::adopt', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
let(:install_path) do
(os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
end

10
spec/defines/sap_spec.rb
View File

@@ -31,14 +31,14 @@ describe 'java::sap', type: :define do
let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }
let(:title) { 'jdk7' }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.070-linux-x64.zip') }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') }
end
context 'when sapjvm 8' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.063-linux-x64.zip') }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when sapmachine 11 jdk' do
@@ -104,7 +104,7 @@ describe 'java::sap', type: :define do
end
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.063-linux-x64.zip') }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when manage_basedir is set to true' do
let(:params) do
@@ -129,14 +129,14 @@ describe 'java::sap', type: :define do
let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }
let(:title) { 'jdk7' }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.070-linux-x64.zip') }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') }
end
context 'when sapjvm 8' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.063-linux-x64.zip') }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when sapmachine 11 jdk' do