Skip to content
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

Jump to bottom

(CAT-2051): Nightly build failure fixes for puppetlab-java module #597

Closed
wants to merge 1 commit into from
+38 −23
Closed

(CAT-2051): Nightly build failure fixes for puppetlab-java module #597

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
4 changes: 3 additions & 1 deletion manifests/adopt.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@
'i386' : { $arch = 'x86-32' }
'x86_64' : { $arch = 'x64' }
'amd64' : { $arch = 'x64' }
'arm64' : { $arch = 'aarch64' }
'aarch64' : { $arch = 'aarch64' }
default : {
fail ("unsupported platform ${$os_architecture}")
}
Expand All @@ -216,7 +218,7 @@
if ( $_version_int == 8 ) {
$_release_minor_package_name = $release_minor
} else {
$_release_minor_package_name = "_${release_minor}"
$_release_minor_package_name = "_${release_minor.split(/\./)[0]}"
}

case $_package_type {
Expand Down
2 changes: 2 additions & 0 deletions manifests/adoptium.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
'i386' : { $arch = 'x86-32' }
'x86_64' : { $arch = 'x64' }
'amd64' : { $arch = 'x64' }
'arm64' : { $arch = 'aarch64' }
'aarch64' : { $arch = 'aarch64' }
default : {
fail ("unsupported platform ${$os_architecture}")
}
Expand Down
6 changes: 5 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@
'Suse': {
case $facts['os']['name'] {
'SLES': {
if (versioncmp($facts['os']['release']['full'], '12.1') >= 0) {
if (versioncmp($facts['os']['release']['full'], '15.5') >= 0) {
$jdk_package = 'java-11-openjdk-devel'
$jre_package = 'java-11-openjdk'
$java_home = '/usr/lib64/jvm/java-11-openjdk-11/'
} elsif (versioncmp($facts['os']['release']['full'], '12.1') >= 0) {
$jdk_package = 'java-1_8_0-openjdk-devel'
$jre_package = 'java-1_8_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
Expand Down
49 changes: 28 additions & 21 deletions spec/acceptance/install_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,31 +99,24 @@
MANIFEST

# AdoptOpenJDK URLs are quite generic, so tests are enabled by default
# We need to test version 8 and >8 (here we use 9), because namings are different after version 8
# We need to test version 9 and 10

adopt_enabled = true unless os[:family].casecmp('SLES').zero?
adopt_version8_major = '8'
adopt_version8_minor = '202'
adopt_version8_build = '08'
adopt_version9_major = '9'
adopt_version9_full = '9.0.4'
adopt_version9_build = '11'
case os[:arch]
when 'aarch64', 'arm64'
adopt_version9_full = '9'
adopt_version9_build = '181'
else
adopt_version9_full = '9.0.4'
adopt_version9_build = '11'
end

adopt_version10_major = '10'
adopt_version10_full = '10.0.2'
adopt_version10_build = '13.1'

install_adopt_jdk_jre = <<MANIFEST
java::adopt {
'test_adopt_jre_version8':
version => '#{adopt_version8_major}',
version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
version_minor => 'b#{adopt_version8_build}',
java => 'jre',
}
java::adopt {
'test_adopt_jdk_version8':
version => '#{adopt_version8_major}',
version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
version_minor => 'b#{adopt_version8_build}',
java => 'jdk',
}
java::adopt {
'test_adopt_jre_version9':
version => '#{adopt_version9_major}',
Expand All @@ -138,6 +131,20 @@
version_minor => '#{adopt_version9_build}',
java => 'jdk',
}
java::adopt {
'test_adopt_jre_version10':
version => '#{adopt_version10_major}',
version_major => '#{adopt_version10_full}',
version_minor => '#{adopt_version10_build}',
java => 'jre',
}
java::adopt {
'test_adopt_jdk_version10':
version => '#{adopt_version10_major}',
version_major => '#{adopt_version10_full}',
version_minor => '#{adopt_version10_build}',
java => 'jdk',
}
MANIFEST

# Adoptium
Expand All @@ -161,7 +168,7 @@
}
MANIFEST

sap_enabled = true
sap_enabled = (os[:arch] == 'x86_64' || os[:arch] == 'amd64')
sap_version7 = '7'
sap_version7_full = '7.1.072'
sap_version8 = '8'
Expand Down
Loading