Run tests against multiple JDK versions

Author: gl-johnson

Dockerfile.test

@@ -1,4 +1,6 @@
-FROM eclipse-temurin:23-jdk
+ARG JDK_VERSION=23
+
+FROM eclipse-temurin:${JDK_VERSION}-jdk
 
 MAINTAINER Conjur Inc
 

Jenkinsfile

@@ -125,19 +125,31 @@ pipeline {
       }
     }
 
-    stage('Run tests and archive test results') {
+    stage('Run tests (JDK8)') {
       environment {
         INFRAPOOL_REGISTRY_URL = "registry.tld"
+        INFRAPOOL_JDK_VERSION = "8"
+      }
+      steps {
+        script {
+          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './bin/test.sh'
+        }
+      }
+    }
+
+    stage('Run tests and archive results (JDK23)') {
+      environment {
+        INFRAPOOL_REGISTRY_URL = "registry.tld"
+        INFRAPOOL_JDK_VERSION = "23"
       }
       steps {
         script {
           lock("api-java-${env.NODE_NAME}") {
             INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './bin/test.sh'
-            INFRAPOOL_EXECUTORV2_AGENT_0.agentStash includes: 'target/surefire-reports/*.xml', name: 'test-results'
+            INFRAPOOL_EXECUTORV2_AGENT_0.agentStash includes: 'target/surefire-reports/*.xml', name: "test-results"
             unstash 'test-results'
           }
         }
-
         junit 'target/surefire-reports/*.xml'
       }
     }

bin/test.sh

@@ -6,6 +6,7 @@ source bin/utils.sh
 trap finish EXIT
 
 export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
+export JDK_VERSION=${INFRAPOOL_JDK_VERSION:-8}
 
 function main() {
   finish
@@ -33,7 +34,7 @@ function runOss () {
 
 # Build DAP test container & start the cluster
 function createDAPTestEnvironment() {
-  docker compose build --pull client cuke-master test-dap
+  docker compose build --pull client cuke-master test-dap --build-arg JDK_VERSION="${JDK_VERSION:-8}"
   export CONJUR_APPLIANCE_URL="https://cuke-master"
   docker compose up -d client cuke-master test-dap
 
@@ -94,6 +95,13 @@ function initializeDapCert() {
 
   # Import cert converted above into keystore
   JAVA_PATH=$(docker exec ${dap_test_cid} sh -c 'echo $JAVA_HOME')
+
+  # If Java 8, append /jre to the path
+  JAVA_VERSION=$(docker exec ${dap_test_cid} sh -c '$JAVA_HOME/bin/java -version 2>&1 | head -n 1')
+  if [[ "$JAVA_VERSION" == *"1.8"* ]]; then
+    JAVA_PATH="${JAVA_PATH}/jre"
+  fi
+  
   import_command="keytool \
      -import \
      -alias cuke-master -v \

bin/utils.sh

@@ -6,7 +6,7 @@ function createOssEnvironment() {
   echo '------------------------------------------------------------'
 
   # Build OSS test container & start the cluster
-  docker compose build --pull client conjur postgres test test-https conjur-proxy-nginx
+  docker compose build --pull client conjur postgres test test-https conjur-proxy-nginx --build-arg JDK_VERSION="${JDK_VERSION:-8}"
   export CONJUR_APPLIANCE_URL="http://conjur"
   docker compose up -d client conjur postgres test-https
 
@@ -81,6 +81,13 @@ function initializeOssCert() {
 
   # Import cert converted above into keystore
   JAVA_PATH=$(docker exec ${conjur_test_cid} sh -c 'echo $JAVA_HOME')
+
+  # If Java 8, append /jre to the path
+  JAVA_VERSION=$(docker exec ${dap_test_cid} sh -c '$JAVA_HOME/bin/java -version 2>&1 | head -n 1')
+  if [[ "$JAVA_VERSION" == *"1.8"* ]]; then
+    JAVA_PATH="${JAVA_PATH}/jre"
+  fi
+
   import_command="keytool \
     -import \
     -alias cucumber \

docker-compose.yml

@@ -58,6 +58,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
     environment:
@@ -69,6 +71,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
       - ./test-cert:/test-cert
@@ -84,6 +88,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
       - ./test-cert:/test-cert