Test RPM with JDK 22

trinodb · Mar 21, 2024 · 862eae8 · 862eae8
1 parent 327fd40
commit 862eae8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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)