(v1.0.4) Fix Pingperf JDK version comparison (adoptium#5585)

* Fix pingPerf Test for JDK22 (adoptium#5571) Update dockerfile replace for JDK22 Signed-off-by: LongyuZhang <[email protected]> * Fix Pingperf JDK version comparison (adoptium#5578) Fix the JDK version comparison in Pingperf tests. Issue: Runtimes_backlog/1515 Signed-off-by: LongyuZhang <[email protected]> --------- Signed-off-by: LongyuZhang <[email protected]>
llxia · Sep 10, 2024 · 798aa06 · 798aa06
1 parent be452ba
commit 798aa06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/external/criu/pingPerf.sh b/external/criu/pingPerf.sh
@@ -50,7 +50,7 @@ getSemeruDockerfile() {
                 findCommandAndReplace '\-H \"\${CRIU_AUTH_HEADER}\"' '--user \"\${DOCKER_REGISTRY_CREDENTIALS_USR}:\${DOCKER_REGISTRY_CREDENTIALS_PSW}\"' $semeruDockerfile ";"
                 findCommandAndReplace 'RUN --mount.*' 'ARG DOCKER_REGISTRY_CREDENTIALS_USR \n ARG DOCKER_REGISTRY_CREDENTIALS_PSW \n RUN set -eux; \\' $semeruDockerfile
                 # in 21-ea, /opt/java/openjdk/legal/java.base/LICENSE does not exist. No need to replace
-                if [[ $jdkVersion != "21" ]]; then
+                if [[ $jdkVersion -lt 21 ]]; then
                     findCommandAndReplace '\/opt\/java\/openjdk\/legal\/java.base\/LICENSE \/licenses;' "\/opt\/java\/openjdk\/legal\/java.base\/LICENSE \/licenses\/;" $semeruDockerfile
                 fi
             else # docker_os is ubuntu