Skip to content

Commit

Permalink
(v1.0.4) Fix Pingperf JDK version comparison (#5585)
Browse files Browse the repository at this point in the history
* Fix pingPerf Test for JDK22 (#5571)

Update dockerfile replace for JDK22

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>

* Fix Pingperf JDK version comparison (#5578)

Fix the JDK version comparison in Pingperf tests.

Issue: Runtimes_backlog/1515

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>

---------

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>
  • Loading branch information
LongyuZhang authored Sep 10, 2024
1 parent be452ba commit 798aa06
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion external/criu/pingPerf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 798aa06

Please sign in to comment.