Bump jdk for netconf scandium tests

Bump openjdk to 21 for scandium, also update script to set JAVA_HOME. Change-Id: Iaff3395df1a47ad3ee936a3ed2e1d38f0494eb5b Signed-off-by: lubos-cicut <[email protected]>
opendaylight · Aug 21, 2024 · 97134e8 · 97134e8
1 parent 680eebd
commit 97134e8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
@@ -20,15 +20,18 @@ else
     KARAF_PROJECT="integration"
 fi
 
-if [ "$JDKVERSION" = 'openjdk17' ]; then
+if [ "$JDKVERSION" = 'openjdk21' ]; then
+    echo "Preparing for JRE Version 21"
+    JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64"
+elif [ "$JDKVERSION" = 'openjdk17' ]; then
     echo "Preparing for JRE Version 17"
-    JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
+    JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
 elif [ "$JDKVERSION" = 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
-    JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
+    JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
 elif [ "$JDKVERSION" = 'openjdk8' ]; then
     echo "Preparing for JRE Version 8"
-    JAVA_HOME="/usr/lib/jvm/java-1.8.0"
+    JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk-amd64"
 fi
 
 echo "Karaf artifact is ${KARAF_ARTIFACT}"

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
@@ -14,7 +14,7 @@
     stream:
       - scandium:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
       - calcium:
           branch: "7.0.x"
           jre: "openjdk17"

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
@@ -14,7 +14,7 @@
     stream:
       - scandium:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
       - calcium:
           branch: "7.0.x"
           jre: "openjdk17"

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
@@ -16,7 +16,7 @@
     stream:
       - scandium:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
       - calcium:
           branch: "7.0.x"
           jre: "openjdk17"

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
@@ -14,7 +14,7 @@
     stream:
       - scandium:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
       - calcium:
           branch: "7.0.x"
           jre: "openjdk17"
@@ -56,7 +56,7 @@
     stream:
       - master:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
@@ -16,7 +16,7 @@
     stream:
       - scandium:
           branch: "master"
-          jre: "openjdk17"
+          jre: "openjdk21"
       - calcium:
           branch: "7.0.x"
           jre: "openjdk17"
@@ -30,7 +30,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240801-040132.691"
+    tools_system_image: "ZZCI - Ubuntu 20.04 - docker - x86_64 - 20240801-160217.825"
 
     # Features to install
     install-features: >