Skip to content

Commit c89d7cc

Browse files
Ramesh7Ramesh7
authored
Merge pull request #576 from puppetlabs/CAT-1427-Removal-of-RedHat-Scientific-OracleLinux-6
[CAT-1427] : Removing RedHat/Scientific/OracleLinux 6
2 parents 042df4c + c53e4e1 commit c89d7cc

File tree

7 files changed

+16
-109
lines changed

7 files changed

+16
-109
lines changed

‎README.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,19 +239,18 @@ This module is officially [supported](https://forge.puppetlabs.com/supported) fo
239239

240240
OpenJDK is supported on:
241241

242-
* Red Hat Enterprise Linux (RHEL) 6, 7
243-
* CentOS 6, 7
244-
* Oracle Linux 6, 7
245-
* Scientific Linux 6
246-
* Debian 9
247-
* Ubuntu 18.04, 20.04
242+
* Red Hat Enterprise Linux (RHEL) 7, 8, 9
243+
* CentOS 7, 8
244+
* Oracle Linux 7
245+
* Debian 10, 11
246+
* Ubuntu 18.04, 20.04, 22.04
248247
* Solaris 11
249-
* SLES 11, 12
248+
* SLES 12, 15
250249

251250
Oracle Java is supported on:
252251

253-
* CentOS 6
254252
* CentOS 7
253+
* CentOS 8
255254
* Red Hat Enterprise Linux (RHEL) 7
256255

257256
AdoptOpenJDK Java is supported on:

‎manifests/params.pp‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,8 @@
99
'RedHat': {
1010
case $facts['os']['name'] {
1111
'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
12-
if (versioncmp($facts['os']['release']['full'], '5.0') < 0) {
13-
$jdk_package = 'java-1.6.0-sun-devel'
14-
$jre_package = 'java-1.6.0-sun'
15-
$java_home = '/usr/lib/jvm/java-1.6.0-sun/jre/'
16-
}
17-
# See cde7046 for why >= 5.0 < 6.3
18-
elsif (versioncmp($facts['os']['release']['full'], '6.3') < 0) {
19-
$jdk_package = 'java-1.6.0-openjdk-devel'
20-
$jre_package = 'java-1.6.0-openjdk'
21-
$java_home = '/usr/lib/jvm/java-1.6.0/'
22-
}
2312
# See PR#160 / c8e46b5 for why >= 6.3 < 7.1
24-
elsif (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
13+
if (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
2514
$jdk_package = 'java-1.7.0-openjdk-devel'
2615
$jre_package = 'java-1.7.0-openjdk'
2716
$java_home = '/usr/lib/jvm/java-1.7.0/'
@@ -73,22 +62,6 @@
7362
default => $facts['os']['architecture']
7463
}
7564
case $facts['os']['release']['major'] {
76-
'9': {
77-
$java = {
78-
'jdk' => {
79-
'package' => 'openjdk-8-jdk',
80-
'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}",
81-
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
82-
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
83-
},
84-
'jre' => {
85-
'package' => 'openjdk-8-jre-headless',
86-
'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}",
87-
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
88-
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
89-
},
90-
}
91-
}
9265
'10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': {
9366
$java = {
9467
'jdk' => {

‎spec/classes/java_spec.rb‎

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,13 @@
33
require 'spec_helper'
44

55
describe 'java', type: :class do
6-
context 'when selecting openjdk for CentOS 5.8' do
7-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.8' }, architecture: 'x86_64' } } }
8-
9-
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
10-
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
11-
end
12-
13-
context 'when selecting openjdk for CentOS 6.3' do
14-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: 'x86_64' } } }
15-
16-
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
17-
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
18-
end
19-
206
context 'when selecting openjdk for CentOS 7.1.1503' do
217
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '7.1.1503' }, architecture: 'x86_64' } } }
228

239
it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
2410
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
2511
end
2612

27-
context 'when selecting openjdk for CentOS 6.2' do
28-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.2' }, architecture: 'x86_64' } } }
29-
30-
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
31-
it { is_expected.not_to contain_exec('update-java-alternatives') }
32-
end
33-
34-
context 'when selecting Oracle JRE with alternatives for CentOS 6.3' do
35-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: 'x86_64' } } }
36-
let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java' } }
37-
38-
it { is_expected.to contain_package('java').with_name('jre') }
39-
40-
it {
41-
expect(subject).to contain_exec('create-java-alternatives').with(
42-
{ command: ['alternatives', '--install', '/usr/bin/java', 'java', '/usr/java/jre1.7.0_67/bin/java', '20000'],
43-
unless: 'alternatives --display java | grep -q /usr/java/jre1.7.0_67/bin/java' },
44-
)
45-
}
46-
47-
it { is_expected.to contain_exec('update-java-alternatives').with_command(['alternatives', '--set', 'java', '/usr/java/jre1.7.0_67/bin/java']) }
48-
end
49-
50-
context 'when selecting Malicious JRE with alternatives for CentOS 6.3' do
51-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: 'x86_64' } } }
52-
let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java ; rm -rf /etc' } }
53-
54-
it { is_expected.to contain_exec('create-java-alternatives').with_unless('alternatives --display java | grep -q /usr/java\\ \\;\\ rm\\ -rf\\ /etc') }
55-
end
56-
57-
context 'when selecting passed value for CentOS 5.3' do
58-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.3' }, architecture: 'x86_64' } } }
59-
let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
60-
61-
it { is_expected.to contain_package('java').with_name('jdk') }
62-
it { is_expected.not_to contain_exec('update-java-alternatives') }
63-
end
64-
65-
context 'when selecting default for CentOS 5.3' do
66-
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.3' }, architecture: 'x86_64' } } }
67-
68-
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
69-
it { is_expected.not_to contain_exec('update-java-alternatives') }
70-
end
71-
7213
context 'when selecting jdk for Debian Buster (10.0)' do
7314
let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }
7415
let(:params) { { 'distribution' => 'jdk' } }
@@ -102,34 +43,28 @@
10243
end
10344

10445
context 'when selecting openjdk for Oracle Linux' do
105-
let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.4' }, architecture: 'x86_64' } } }
46+
let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '7.0' }, architecture: 'x86_64' } } }
10647

10748
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
10849
end
10950

110-
context 'when selecting openjdk for Oracle Linux 6.2' do
111-
let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.2' }, architecture: 'x86_64' } } }
112-
113-
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
114-
end
115-
11651
context 'when selecting passed value for Oracle Linux' do
117-
let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.3' }, architecture: 'x86_64' } } }
52+
let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '7.0' }, architecture: 'x86_64' } } }
11853
let(:params) { { 'distribution' => 'jre' } }
11954

12055
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
12156
end
12257

12358
context 'when selecting passed value for Scientific Linux' do
124-
let(:facts) { { os: { family: 'RedHat', name: 'Scientific', release: { full: '6.4' }, architecture: 'x86_64' } } }
59+
let(:facts) { { os: { family: 'RedHat', name: 'Scientific', release: { full: '7.0' }, architecture: 'x86_64' } } }
12560
let(:params) { { 'distribution' => 'jre' } }
12661

12762
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
12863
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
12964
end
13065

13166
context 'when selecting passed value for Scientific Linux CERN (SLC)' do
132-
let(:facts) { { os: { family: 'RedHat', name: 'SLC', release: { full: '6.4' }, architecture: 'x86_64' } } }
67+
let(:facts) { { os: { family: 'RedHat', name: 'SLC', release: { full: '7.0' }, architecture: 'x86_64' } } }
13368
let(:params) { { 'distribution' => 'jre' } }
13469

13570
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }

‎spec/defines/adopt_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe 'java::adopt', type: :define do
66
context 'with CentOS 64-bit' do
7-
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
7+
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } }
88

99
context 'when manage_symlink is set to true' do
1010
let(:params) do

‎spec/defines/adoptium_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe 'java::adoptium', type: :define do
66
context 'with CentOS 64-bit' do
7-
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
7+
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } }
88

99
context 'when manage_symlink is set to true' do
1010
let(:params) do

‎spec/defines/download_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
let(:url) { 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz' }
77

88
context 'with CentOS 64-bit' do
9-
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
9+
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } }
1010

1111
context 'when passing URL to url parameter' do
1212
let(:params) do

‎spec/defines/sap_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe 'java::sap', type: :define do
66
context 'with CentOS 64-bit' do
7-
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
7+
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } }
88

99
context 'when manage_symlink is set to true' do
1010
let(:params) do

0 commit comments

Comments
 (0)