Merge pull request #601 from span786/CAT-2051-fix-sles-15-failures

Author: malikparvez

manifests/init.pp

@@ -110,13 +110,12 @@
     default    => '--jre'
   }
 
-  # Enable legacy repo to install net-tools-deprecated package
-  # If SUSE OS major version is >= 15 and minor version is > 3
-  if ($facts['os']['family'] in ['SLES', 'SUSE']) and (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
+  # If the OS is SLES >= 15.3, enable the legacy repo to install net-tools-deprecated package
+  if ($facts['os']['family'] in ['SLES', 'SUSE']) and (versioncmp($facts['os']['release']['full'], '15.3') >= 0) {
     exec { 'Enable legacy repos':
       path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-      command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
-      unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
+      command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['full']}/x86_64",
+      unless  => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['full']}/x86_64",
     }
   }
 

spec/classes/java_spec.rb

@@ -95,7 +95,7 @@
   end
 
   context 'when selecting default for OpenSUSE 12.3' do
-    let(:facts) { { os: { family: 'Suse', name: 'OpenSUSE', release: { major: '12.3' }, architecture: 'x86_64' } } }
+    let(:facts) { { os: { family: 'Suse', name: 'OpenSUSE', release: { full: '12.3', major: '12', minor: '3' }, architecture: 'x86_64' } } }
 
     it { is_expected.to 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/') }