Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pingPerf test replacing OpenLiberty base image #4609

Merged
merged 1 commit into from
Jun 8, 2023

Conversation

LongyuZhang
Copy link
Contributor

  • Update pingPerf test replacing OpenLiberty base image

- Update pingPerf test replacing OpenLiberty base image

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>
@LongyuZhang
Copy link
Contributor Author

Test Links:

  • checkpoint image create: hyc_grinder 33221
  • restore: hyc_grinder 33222

@LongyuZhang LongyuZhang requested review from llxia and renfeiw June 7, 2023 19:36
@@ -86,7 +86,8 @@ prepare() {
curCommitID=$(git rev-parse HEAD)
echo "Using dockerfile from OpenLiberty/ci.docker repo branch $openLibertyBranch with commit hash $curCommitID"
libertyDockerfilePath="releases/latest/beta/Dockerfile.ubi.openjdk17"
sed -i 's;FROM icr.io\/appcafe\/ibm-semeru-runtimes:open-17-ea-jdk-ubi-amd64;FROM local-ibm-semeru-runtimes:latest;' $libertyDockerfilePath
# replace OpenLiberty dockerfile base image
sed -i 's;FROM icr.io\/appcafe\/ibm-semeru-runtimes:open-17-jdk-ubi;FROM local-ibm-semeru-runtimes:latest;' $libertyDockerfilePath
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case the OpenLiberty changes this again, we can add a check? If the string that we are looking for does not exist, fail the build? For example:

imageFrom="FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi;"
        grep "${imageFrom}" $libertyDockerfilePath
        rtCode=$?
        if [ $rtCode == 0 ]; then
            echo "Replace ${imageFrom} to FROM local-ibm-semeru-runtimes:latest;"
            sed -i 's;FROM icr.io\/appcafe\/ibm-semeru-runtimes:open-17-jdk-ubi;FROM local-ibm-semeru-runtimes:latest;' $libertyDockerfilePath
        else
            echo "Cannot find ${imageFrom} in https://github.com/OpenLiberty/ci.docker/blob/instanton/releases/latest/beta/Dockerfile.ubi.openjdk17"
            exit 1
        fi

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above code will not work as we have space in imageFrom. Maybe we can use q command in sed:
https://stackoverflow.com/questions/15965073/return-value-of-sed-for-no-match/15965681#15965681

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have decided to do this in a separate PR so the weekly run will fail.

Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@renfeiw renfeiw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@renfeiw renfeiw merged commit 0756090 into adoptium:master Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants