Merge pull request #507 from david22swan/GH-C&T-7/main/remove_compatible_code

.github/workflows/spec.yml

@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      - name: Run Static & Syntax Tests
+      # - name: Run Static & Syntax Tests
-        if: ${{ github.repository_owner == 'puppetlabs' }}
+      #   if: ${{ github.repository_owner == 'puppetlabs' }}
-        run: |
+      #   run: |
-          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix

README.md

@@ -239,19 +239,15 @@ This module is officially [supported](https://forge.puppetlabs.com/supported) fo
 
 OpenJDK is supported on:
 
-* Red Hat Enterprise Linux (RHEL) 5, 6, 7
+* Red Hat Enterprise Linux (RHEL) 6, 7
-* CentOS 5, 6, 7
+* CentOS 6, 7
 * Oracle Linux 6, 7
 * Scientific Linux 6
-* Debian 8, 9
+* Debian 9
-* Ubuntu 14.04, 16.04, 18.04, 20.04
+* Ubuntu 18.04, 20.04
 * Solaris 11
 * SLES 11, 12
 
-Sun Java is supported on:
-
-* Debian 6
-
 Oracle Java is supported on:
 
 * CentOS 6

manifests/params.pp

@@ -74,59 +74,7 @@ class java::params {
         default   => $facts['os']['architecture']
       }
       case $facts['os']['release']['major'] {
-        '7', '8', '14.04': {
+        '9': {
-          $java =  {
-            'jdk' => {
-              'package'          => 'openjdk-7-jdk',
-              'alternative'      => "java-1.7.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
-            },
-            'jre' => {
-              'package'          => 'openjdk-7-jre-headless',
-              'alternative'      => "java-1.7.0-openjdk-${facts['os']['architecture']}",
-              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
-            },
-            'oracle-jre' => {
-              'package'          => 'oracle-j2re1.7',
-              'alternative'      => 'j2re1.7-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2re1.7-oracle/',
-            },
-            'oracle-jdk' => {
-              'package'          => 'oracle-j2sdk1.7',
-              'alternative'      => 'j2sdk1.7-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
-            },
-            'oracle-j2re' => {
-              'package'          => 'oracle-j2re1.8',
-              'alternative'      => 'j2re1.8-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2re1.8-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2re1.8-oracle/',
-            },
-            'oracle-j2sdk' => {
-              'package'          => 'oracle-j2sdk1.8',
-              'alternative'      => 'j2sdk1.8-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2sdk1.8-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2sdk1.8-oracle/',
-            },
-            'oracle-java8-jre' => {
-              'package'          => 'oracle-java8-jre',
-              'alternative'      => "jre-8-oracle-${oracle_architecture}",
-              'alternative_path' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/",
-            },
-            'oracle-java8-jdk' => {
-              'package'          => 'oracle-java8-jdk',
-              'alternative'      => "jdk-8-oracle-${oracle_architecture}",
-              'alternative_path' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/",
-            },
-          }
-        }
-        '9', '15.04', '15.10', '16.04', '16.10', '17.04', '17.10': {
           $java =  {
             'jdk' => {
               'package'          => 'openjdk-8-jdk',

provision.yaml

@@ -11,14 +11,11 @@ vagrant:
 travis_deb:
   provisioner: docker
   images:
-  - litmusimage/debian:8
   - litmusimage/debian:9
   - litmusimage/debian:10
 travis_ub_6:
   provisioner: docker
   images:
-  - litmusimage/ubuntu:14.04
-  - litmusimage/ubuntu:16.04
   - litmusimage/ubuntu:18.04
   - litmusimage/ubuntu:20.04
 travis_el7:
@@ -44,11 +41,8 @@ release_checks_6:
   - oracle-7-x86_64
   - scientific-6-x86_64
   - scientific-7-x86_64
-  - debian-8-x86_64
   - debian-9-x86_64
   - debian-10-x86_64
-  - ubuntu-1404-x86_64
-  - ubuntu-1604-x86_64
   - ubuntu-1804-x86_64
   - ubuntu-2004-x86_64
   - sles-12-x86_64

spec/classes/java_spec.rb

@@ -71,36 +71,20 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
   end
 
-  context 'when select jdk for Ubuntu Trusty (14.04)' do
+  context 'when select jdk for Ubuntu Bionic (18.04)' do
-    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
     let(:params) { { 'distribution' => 'jdk' } }
 
-    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
+    it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
   end
 
-  context 'when select jre for Ubuntu Trusty (14.04)' do
+  context 'when select jre for Ubuntu Bionic (18.04)' do
-    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
     let(:params) { { 'distribution' => 'jre' } }
 
-    it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
+    it { is_expected.to contain_package('java').with_name('openjdk-11-jre-headless') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
-  end
-
-  context 'when select jdk for Ubuntu xenial (16.04) on ARM' do
-    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'xenial' }, release: { major: '16.04' }, architecture: 'armv7l' } } }
-    let(:params) { { 'distribution' => 'jdk' } }
-
-    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-armhf/') }
-  end
-
-  context 'when select jdk for Ubuntu xenial (16.04) on ARM64' do
-    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'xenial' }, release: { major: '16.04' }, architecture: 'aarch64' } } }
-    let(:params) { { 'distribution' => 'jdk' } }
-
-    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-arm64/') }
   end
 
   context 'when select openjdk for Oracle Linux' do
@@ -174,7 +158,7 @@ describe 'java', type: :class do
   end
 
   describe 'custom java package' do
-    let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'jessie' }, release: { major: '8' }, architecture: 'amd64' } } }
+    let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bullseye' }, release: { major: '11' }, architecture: 'amd64' } } }
 
     context 'when all params provided' do
       let(:params) do

spec/defines/adopt_spec.rb

@@ -178,7 +178,7 @@ describe 'java::adopt', type: :define do
   end
 
   context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
 
     context 'when AdoptOpenJDK Java 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }

spec/defines/adoptium_spec.rb

@@ -143,7 +143,7 @@ describe 'java::adoptium', type: :define do
   end
 
   context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
 
     context 'when Adoptium Temurin Java 16 JDK' do
       let(:params) do

spec/defines/download_spec.rb

@@ -75,7 +75,7 @@ describe 'java::download', type: :define do
   end
 
   context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
 
     context 'when passing URL to url parameter' do
       let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }

spec/defines/sap_spec.rb

@@ -125,7 +125,7 @@ describe 'java::sap', type: :define do
   end
 
   context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
 
     context 'when sapjvm 7' do
       let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }