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 #776

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

gounthar
Copy link
Contributor

@gounthar gounthar commented Mar 18, 2024

This is a follow-up to #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.

I noticed that there was no arm32 defined in check-jdk.sh, even though it is supposed to be called by the jdk21-preview manifest.

I'm not sure how we got this working for arm32 in the first place. I'm not saying it isn't working; I just don't understand how it works. 🤷

So, I haven't removed the arm32 support in this PR. I will do so in another PR, but it could have some side effects for arm32 (or not; I'm sure you all understand how this worked for arm32).

Anyway, there is no new Temurin release for arm32 in ea-beta (or anything else, to be clear), so that shouldn't be an issue.

Testing done

make build agent_debian_jdk21_preview and make build agent_debian_jdk21_preview.

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

@gounthar gounthar requested a review from a team as a code owner March 18, 2024 14:46
@gounthar gounthar marked this pull request as draft March 18, 2024 14:53
@gounthar gounthar marked this pull request as ready for review March 18, 2024 16:30
@dduportal dduportal changed the title chore(docker) Temurin has an official build for s390x feat(JDK21) Use official Temurin build for linux/s390x Mar 18, 2024
@dduportal dduportal merged commit 194c3fa into jenkinsci:master Mar 18, 2024
10 checks passed
@gounthar gounthar deleted the s390x branch March 18, 2024 18:17
@gounthar
Copy link
Contributor Author

Somehow, the build failed, but it doesn't seem linked to the change. 🤷

https://github.com/jenkinsci/docker-agent/runs/22796738582

@dduportal
Copy link
Contributor

Somehow, the build failed, but it doesn't seem linked to the change. 🤷

https://github.com/jenkinsci/docker-agent/runs/22796738582

Good catch! CI logs shows a network timeout.

But the latest agent release shows there is a JDK21 linux/s390x image 👏 : https://hub.docker.com/layers/jenkins/agent/3206.vb_15dcf73f6a_9-7-jdk21/images/sha256-e0e443a4a2501a45bf978b101aef23de781dd3b2fbb092608b4a601e0c4a2799?context=explore

@gounthar
Copy link
Contributor Author

Good news, thanks! 👍

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.

3 participants