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

feat(JDK21) Use official Temurin build for linux/s390x #370

Merged
merged 2 commits into from
Mar 29, 2024

Conversation

gounthar
Copy link
Contributor

@gounthar gounthar commented Mar 21, 2024

This is a follow-up to jenkinsci/docker-agent#772.
@MarkEWaite noted that we should use the official build versions for the architectures that have moved out of preview.
@dduportal then noted that the only one that was left was s390x.

I'm proposing this small change to remove s390x's JDK from the preview and start using the official Temurin builds.
As updatecli now forces us to declare the full architecture for docker images, I also added linux and windows where needed.

The updatecli jdk11 action should fail, as the latest JDK11 Temurin version is only for Mac, and does not exist as a Docker image.

Testing done

updatecli diff --debug --config ./updatecli/updatecli.d/jdk21.yaml --values ./updatecli/values.github-action.yaml
updatecli diff --debug --config ./updatecli/updatecli.d/jdk17.yaml --values ./updatecli/values.github-action.yaml
updatecli diff --debug --config ./updatecli/updatecli.d/jdk11.yaml --values ./updatecli/values.github-action.yaml

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
@gounthar gounthar requested a review from a team as a code owner March 21, 2024 21:10
Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

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

The build is failing with the following error on the linux/s390x step:

ERROR: failed to solve: eclipse-temurin:21.0.1_12-jdk-jammy: failed to resolve source metadata for docker.io/library/eclipse-temurin:21.0.1_12-jdk-jammy: no match for platform in manifest: not found

The reason is that the JDK21 need to be updated:

What do you think about the following plan:

?

@gounthar
Copy link
Contributor Author

My, oh, my, I'm sorry, I went too fast and just tested the updatecli scripts, and not the image-building part. 😊
Let me rework that.

Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

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

Working since #383 is applied

👏

@dduportal dduportal merged commit 0222d7a into jenkinsci:master Mar 29, 2024
7 checks passed
@dduportal
Copy link
Contributor

@gounthar gounthar deleted the s390x-jdk21 branch March 29, 2024 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants