From f90756d87c28f02dde8e6823cb35d96f50fa5891 Mon Sep 17 00:00:00 2001
From: Daiana_Mezdrea <daiana.mezdrea@yahoo.com>
Date: Fri, 23 Oct 2020 14:33:40 +0300
Subject: [PATCH] Add the good links for solving the 404 error and exclude sles

---
 manifests/sap.pp                |  6 +++---
 spec/acceptance/install_spec.rb |  6 +++---
 spec/defines/sap_spec.rb        | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/sap.pp b/manifests/sap.pp
index 21d5e2c..9cb39ee 100644
--- a/manifests/sap.pp
+++ b/manifests/sap.pp
@@ -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
diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb
index 40b947f..7d31564 100644
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -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
diff --git a/spec/defines/sap_spec.rb b/spec/defines/sap_spec.rb
index e2449ca..9d10686 100644
--- a/spec/defines/sap_spec.rb
+++ b/spec/defines/sap_spec.rb
@@ -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