From 5a0282a9c4fdce99acdb217fc7775fef52e9f77e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 9 Mar 2026 22:35:33 +0900
Subject: [PATCH] Add tests with OpenJDK 25

... and also add back test coverage with OpenJDK 8 for smooth
transition.

Change-Id: I9e4fed28bb1de09a4516b436950989445e96703b
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 .zuul.yaml              | 11 ++++++++++-
 devstack/plugin.sh      |  2 +-
 install_libs.sh         |  2 +-
 src/java/SBus/build.xml |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5835bbfb..3469e818 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
     check:
       jobs:
         - storlets-functional
+        - storlets-functional-openjdk21
         - storlets-functional-openjdk17
         - storlets-functional-podman
     gate:
@@ -32,7 +33,7 @@
       - ^tests/unit/.*$
     vars:
       storlets_gateway_module: docker
-      storlets_jdk_version: 21
+      storlets_jdk_version: 25
 
 - job:
     name: storlets-functional-openjdk17
@@ -42,6 +43,14 @@
       storlets_gateway_module: docker
       storlets_jdk_version: 17
 
+- job:
+    name: storlets-functional-openjdk21
+    parent: storlets-functional
+    voting: false
+    vars:
+      storlets_gateway_module: docker
+      storlets_jdk_version: 21
+
 - job:
     name: storlets-functional-podman
     parent: storlets-functional
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b125b1d7..5d13c8c9 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -72,7 +72,7 @@ STORLETS_CACHE_DIR=${STORLETS_CACHE_DIR:-${STORLETS_DATA_DIR}cache/scopes}
 STORLETS_PIPES_DIR=${STORLETS_PIPES_DIR:-${STORLETS_DATA_DIR}pipes/scopes}
 STORLETS_RESTART_CONTAINER_TIMEOUT=${STORLETS_RESTART_CONTAINER_TIMEOUT:-3}
 STORLETS_RUNTIME_TIMEOUT=${STORLETS_RUNTIME_TIMEOUT:-40}
-STORLETS_JDK_VERSION=${STORLETS_JDK_VERSION:-21}
+STORLETS_JDK_VERSION=${STORLETS_JDK_VERSION:-25}
 
 if [ $STORLETS_GATEWAY_MODULE == 'podman' ]; then
     CONTAINER_CMD=podman
diff --git a/install_libs.sh b/install_libs.sh
index afe0bcc7..1b614b96 100755
--- a/install_libs.sh
+++ b/install_libs.sh
@@ -6,7 +6,7 @@
 #       so you may need root privilege to execute this script
 set -x
 
-STORLETS_JDK_VERSION=${STORLETS_JDK_VERSION:-21}
+STORLETS_JDK_VERSION=${STORLETS_JDK_VERSION:-25}
 
 # install c library
 cd src/c/sbus
diff --git a/src/java/SBus/build.xml b/src/java/SBus/build.xml
index cb45bfe4..bf2c1510 100644
--- a/src/java/SBus/build.xml
+++ b/src/java/SBus/build.xml
@@ -17,7 +17,7 @@
     <property name="jarname" value="SBusJavaFacade.jar"/>
     <property name="libdir" value="/usr/local/lib/storlets/java"/>
     <property environment="env"/>
-    <property name="env.STORLETS_JDK_VERSION" value="21"/>
+    <property name="env.STORLETS_JDK_VERSION" value="25"/>
 
     <target name="clean">
         <delete dir="bin" />