add support to execute the tests using java 21 on standalone-suite

rh-messaging-qe · Aug 20, 2024 · 7d424cf · 7d424cf
1 parent ac16a28
commit 7d424cf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/standalone-suite/dockerfiles/artemis/DockerfileArtemisRedHatBased b/standalone-suite/dockerfiles/artemis/DockerfileArtemisRedHatBased
@@ -40,11 +40,11 @@ EXPOSE \
 # Expose some outstanding folders
 VOLUME ["${artemis_instance_home}", "${artemis_install_home}"]
 
-COPY openjdk-java-17.tar.xz oracle-java-11.tar.gz oracle-java-17.tar.gz /tmp
+COPY openjdk-java-*.tar.xz oracle-java-*.tar.gz /tmp
 COPY install-java-versions.sh /usr/local/bin/
 RUN /usr/local/bin/install-java-versions.sh "${BASE_IMAGE}" \
     && rm -rf /usr/local/bin/install-java-versions.sh \
-    && rm -rf /tmp/openjdk-java-17.tar.xz /tmp/oracle-java-11.tar.gz /tmp/oracle-java-17.tar.gz
+    && rm -rf /tmp/openjdk-java-*.tar.xz /tmp/oracle-java-*.tar.gz
 
 COPY pulp-repository-*.repo /tmp
 COPY install-pulp-repo.sh install-packages.sh /usr/local/bin

diff --git a/standalone-suite/dockerfiles/artemis/build-and-push-images.sh b/standalone-suite/dockerfiles/artemis/build-and-push-images.sh
@@ -20,16 +20,27 @@ echo ""
 echo "#######################################################################"
 echo "Downloading additional Java JDK: openjdk-java-17"
 wget -nv -c -O openjdk-java-17.tar.xz \
-    https://download.eng.bos.redhat.com/released/OpenJDK/17.0.6/java-17-openjdk-17.0.6.0.10-2.portable.jdk.el.x86_64.tar.xz
+    https://download.eng.bos.redhat.com/released/OpenJDK/17.0.12/java-17-openjdk-17.0.12.0.7-1.portable.jdk.el.x86_64.tar.xz
 tar -Jtf openjdk-java-17.tar.xz > /dev/null
+
+echo "Downloading additional Java JDK: openjdk-java-21"
+wget -nv -c -O openjdk-java-21.tar.xz \
+    https://download.eng.bos.redhat.com/released/OpenJDK/21.0.4/java-21-openjdk-21.0.4.0.7-1.portable.jdk.x86_64.tar.xz
+tar -Jtf openjdk-java-21.tar.xz > /dev/null
+
 echo "Downloading additional Java JDK: oracle-java-11"
 wget -nv -c -O oracle-java-11.tar.gz \
   https://repository.engineering.redhat.com/nexus/repository/rhm-qe-amq-clients-raw/jdk/jdk-11.0.15.1_linux-x64_bin.tar.gz
 tar -ztf oracle-java-11.tar.gz > /dev/null
+
 echo "Downloading additional Java JDK: oracle-java-17"
 wget -nv -c -O oracle-java-17.tar.gz https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.tar.gz
 tar -ztf oracle-java-17.tar.gz > /dev/null
 
+echo "Downloading additional Java JDK: oracle-java-21"
+wget -nv -c -O oracle-java-21.tar.gz https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz
+tar -ztf oracle-java-21.tar.gz > /dev/null
+
 echo ""
 for base_image_name in "${BASE_IMAGES[@]}"; do
   if [[ "${base_image_name}" =~ ubi[0-9] ]]; then

diff --git a/standalone-suite/dockerfiles/artemis/install-java-versions.sh b/standalone-suite/dockerfiles/artemis/install-java-versions.sh
@@ -48,6 +48,28 @@ mkdir -p /opt/oracle-java-17
 tar -zxf /tmp/oracle-java-17.tar.gz -C /opt/oracle-java-17 --strip-components=1
 echo "oracle java 17 installed"
 
+echo ""
+echo "##########################"
+echo "installing openjdk java 21"
+echo "##########################"
+if [[ "${BASE_IMAGE}" =~ .*"ubi7":.* ]]; then
+  mkdir -p /opt/openjdk-java-21
+  tar -Jxf /tmp/openjdk-java-21.tar.xz -C /opt/openjdk-java-21 --strip-components=1
+else
+  yum --assumeyes install \
+    java-21-openjdk-headless
+  ln -s /usr/lib/jvm/jre-21-openjdk /opt/openjdk-java-21
+fi
+echo "openjdk java 21 installed"
+
+echo ""
+echo "#########################"
+echo "installing oracle java 21"
+echo "#########################"
+mkdir -p /opt/oracle-java-21
+tar -zxf /tmp/oracle-java-21.tar.gz -C /opt/oracle-java-21 --strip-components=1
+echo "oracle java 21 installed"
+
 yum --assumeyes clean all
 echo ""
 echo "install-java-version.sh finished"