Skip to content

[IAC-1208] - Add the good links for solving the 404 error and exclude sles #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanfrancrisko merged 1 commit into from
Oct 26, 2020
Merged

[IAC-1208] - Add the good links for solving the 404 error and exclude sles #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifests/sap.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@
# 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')
}
Expand Down Expand Up @@ -140,7 +140,7 @@
}

# 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
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/install_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@

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'
Expand Down Expand Up @@ -269,7 +269,7 @@
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
Expand Down
10 changes: 5 additions & 5 deletions spec/defines/sap_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
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
Expand Down Expand Up @@ -104,7 +104,7 @@
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
Expand All @@ -129,14 +129,14 @@
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
Expand Down