From 862eae8dce2bc94dbf05937e47f47e26b3cfbd43 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Thu, 21 Mar 2024 18:23:54 +0100 Subject: [PATCH] Test RPM with JDK 22 --- core/trino-server-rpm/src/main/rpm/preinstall | 4 ++++ .../src/test/java/io/trino/server/rpm/ServerIT.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/core/trino-server-rpm/src/main/rpm/preinstall b/core/trino-server-rpm/src/main/rpm/preinstall index dbbf425b2c6c..90e9e1f80c7c 100644 --- a/core/trino-server-rpm/src/main/rpm/preinstall +++ b/core/trino-server-rpm/src/main/rpm/preinstall @@ -35,9 +35,13 @@ if ! check_if_correct_java_version "$JAVA_HOME"; then java_found=false for candidate in \ /usr/lib/jvm/java-21-* \ + /usr/lib/jvm/java-22-* \ /usr/lib/jvm/zulu-21 \ + /usr/lib/jvm/zulu-22 \ /usr/lib/jvm/temurin-21 \ /usr/lib/jvm/temurin-21-* \ + /usr/lib/jvm/temurin-22 \ + /usr/lib/jvm/temurin-22-* \ /usr/lib/jvm/default-java \ /usr/java/default \ / \ diff --git a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java index 562e6c876b3d..e987045dfd26 100644 --- a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java +++ b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java @@ -76,6 +76,9 @@ public void testInstallUninstall() // Release names as in the https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getReleaseNames testInstall("jdk-21.0.2+13", "/usr/lib/jvm/temurin-21", "21"); testUninstall("jdk-21.0.2+13", "/usr/lib/jvm/temurin-21", "21"); + + testInstall("jdk-22+36", "/usr/lib/jvm/temurin-22", "22"); + testUninstall("jdk-22+36", "/usr/lib/jvm/temurin-22", "22"); } private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)