This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new a80cccec4 BIGTOP-4012. Update Adoptium repository settings for Debian
11 in bigtop_toolchain. (#1185)
a80cccec4 is described below
commit a80cccec4d4dbd2b2f6f2d90daca8f9a6e1ed77d
Author: Kengo Seki <[email protected]>
AuthorDate: Sun Dec 24 00:08:19 2023 +0900
BIGTOP-4012. Update Adoptium repository settings for Debian 11 in
bigtop_toolchain. (#1185)
---
bigtop-deploy/puppet/manifests/bigtop_repo.pp | 10 +++++-----
bigtop-deploy/puppet/manifests/jdk.pp | 2 +-
.../src/common/bigtop-utils/bigtop-detect-javahome | 2 +-
bigtop_toolchain/manifests/env.pp | 2 +-
bigtop_toolchain/manifests/installer.pp | 2 +-
bigtop_toolchain/manifests/jdk.pp | 16 ++++++++--------
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
index 46d197fcc..6c309207e 100644
--- a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
+++ b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
@@ -70,8 +70,8 @@ class bigtop_repo {
# BIGTOP-3343. This is a JDK-related stuff, so it should be in jdk.pp
ordinarily.
# But it looks like that this definition must be here to avoid cyclic
resource dependencies.
if ($operatingsystem == 'Debian' and 0 <=
versioncmp($operatingsystemrelease, "10")) {
- apt::source { 'adoptopenjdk':
- location => 'https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/',
+ apt::source { 'adoptium':
+ location => 'https://packages.adoptium.net/artifactory/deb/',
}
}
@@ -86,9 +86,9 @@ class bigtop_repo {
# BIGTOP-3343. This is a JDK-related stuff, but it's here for the same
reason described above.
if ($operatingsystem == 'Debian' and 0 <=
versioncmp($operatingsystemrelease, "10")) {
- apt::key { "add_adoptopenjdk_key":
- id => "8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03",
- source =>
"https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public";,
+ apt::key { "add_adoptium_key":
+ id => "3B04D753C9050D9A5D343F39843C48A565F8F04B",
+ source =>
"https://packages.adoptium.net/artifactory/api/gpg/key/public";,
}
}
} else {
diff --git a/bigtop-deploy/puppet/manifests/jdk.pp
b/bigtop-deploy/puppet/manifests/jdk.pp
index 9ac94c813..fea19a5a4 100644
--- a/bigtop-deploy/puppet/manifests/jdk.pp
+++ b/bigtop-deploy/puppet/manifests/jdk.pp
@@ -23,7 +23,7 @@ class jdk {
if versioncmp($operatingsystemrelease, "10") < 0 {
$jdk_pkg_name = 'openjdk-8-jdk'
} else {
- $jdk_pkg_name = 'adoptopenjdk-8-hotspot'
+ $jdk_pkg_name = 'temurin-8-jdk'
}
package { 'jdk':
name => $jdk_pkg_name,
diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
index ff41cfea9..3509e5bc3 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -36,7 +36,7 @@ OPENJAVA8_HOME_CANDIDATES=(
'/usr/lib/jvm/java-1.8.0-openjdk-ppc64el'
'/usr/lib/jvm/java-1.8.0-openjdk'
'/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0'
- '/usr/lib/jvm/adoptopenjdk-8-hotspot'
+ '/usr/lib/jvm/temurin-8-jdk'
)
MISCJAVA_HOME_CANDIDATES=(
diff --git a/bigtop_toolchain/manifests/env.pp
b/bigtop_toolchain/manifests/env.pp
index 22cf4eeaa..f91ef28f4 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -29,7 +29,7 @@ class bigtop_toolchain::env {
if $::operatingsystemmajrelease =~ /^\d$/ {
$javahome = "/usr/lib/jvm/${java}-openjdk-$arch"
} else {
- $javahome = "/usr/lib/jvm/adoptopenjdk-8-hotspot-$arch"
+ $javahome = "/usr/lib/jvm/temurin-8-jdk-$arch"
}
}
'Ubuntu': {
diff --git a/bigtop_toolchain/manifests/installer.pp
b/bigtop_toolchain/manifests/installer.pp
index 9d1a641b7..f6a10087f 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -31,7 +31,7 @@ class bigtop_toolchain::installer {
case $::operatingsystem {
/Debian/: {
exec { 'ensure java 8 is set as default':
- command => "update-java-alternatives --set adoptopenjdk-8*",
+ command => "update-java-alternatives --set temurin-8*",
path => ['/usr/sbin', '/usr/bin', '/bin'],
require => Class['bigtop_toolchain::jdk'],
}
diff --git a/bigtop_toolchain/manifests/jdk.pp
b/bigtop_toolchain/manifests/jdk.pp
index 89986a6ec..a5dfc3c54 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -16,19 +16,19 @@
class bigtop_toolchain::jdk {
case $::operatingsystem {
/Debian/: {
- # We need JDK 8, but Debian 10 only provides the openjdk-11-jdk package
in the official repo.
- # So we use AdoptOpenJDK instead, following the steps described on:
- # https://adoptopenjdk.net/installation.html#linux-pkg
+ # We need JDK 8, but Debian 10+ only provides the openjdk-11-jdk package
(or greater) in the official repo.
+ # So we use Eclipse Temurin instead, following the steps described on:
+ #
https://adoptium.net/installation/linux/#_deb_installation_on_debian_or_ubuntu
include apt
- apt::source { 'adoptopenjdk':
- location => 'https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/',
+ apt::source { 'adoptium':
+ location => 'https://packages.adoptium.net/artifactory/deb/',
key => {
- id => '8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03',
- source =>
'https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public',
+ id => '3B04D753C9050D9A5D343F39843C48A565F8F04B',
+ source =>
'https://packages.adoptium.net/artifactory/api/gpg/key/public',
},
} ->
- package { 'adoptopenjdk-8-hotspot' :
+ package { 'temurin-8-jdk' :
ensure => present,
}
}
