Update PingPerf Dockerfile path for OpenLiberty

- Update PingPerf Dockerfile path for OpenLiberty Signed-off-by: LongyuZhang <[email protected]>
adoptium · Feb 8, 2024 · 35c6d80 · 35c6d80
1 parent e32dc86
commit 35c6d80
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/external/criu/pingPerf.sh b/external/criu/pingPerf.sh
@@ -117,10 +117,10 @@ prepare() {
         curCommitID=$(git rev-parse HEAD)
         echo "Using dockerfile from OpenLiberty/ci.docker repo branch $openLibertyBranch with commit hash $curCommitID"
         if [[ $docker_os == "ubi" ]]; then
-            # Temporarily OpenLiberty ubi dockerfile only supports openjdk 17, not 11
-            libertyDockerfilePath="releases/latest/beta/Dockerfile.${docker_os}.openjdk17"
+            # Temporarily OpenLiberty ubi dockerfile only supports openjdk 21, using it for 11 and 17 too
+            libertyDockerfilePath="releases/latest/beta/Dockerfile.${docker_os}.openjdk21"
             # replace OpenLiberty dockerfile base image
-            findCommandAndReplace "FROM icr.io\/appcafe\/ibm-semeru-runtimes:open-17-jdk-${docker_os}" "FROM local-ibm-semeru-runtimes:latest" $libertyDockerfilePath '/'
+            findCommandAndReplace "FROM icr.io\/appcafe\/ibm-semeru-runtimes:open-21-jre-${docker_os}9-minimal" "FROM local-ibm-semeru-runtimes:latest" $libertyDockerfilePath '/'
         else # docker_os is ubuntu
             libertyDockerfilePath="releases/latest/beta/Dockerfile.${docker_os}.openjdk${jdkVersion}"
             findCommandAndReplace "FROM ibm-semeru-runtimes:open-${jdkVersion}-jre-jammy" "FROM local-ibm-semeru-runtimes:latest" $libertyDockerfilePath '/'