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

Switch to GA eclipse-temurin:jdk21 image #1738

Merged
merged 5 commits into from
Oct 19, 2023

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented Oct 17, 2023

This PR switches to the official eclipse-temurin:jdk21 images for alpine and debian variants.

The optional workaround added in 8e516d8 should be removed when these architectures will be supported in upstream images, could be removed from this PR too.

Related: #1737 (comment)

Testing done

https://ci.jenkins.io/job/Packaging/job/docker/view/change-requests/job/PR-1738/4/: with amd64 & arm64 only for now as available architectures with official eclipse-temurin:jdk21 base images.

https://ci.jenkins.io/job/Packaging/job/docker/view/change-requests/job/PR-1738/9/: with the optional workaround

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
    Options
  2. Ensure that the pull request title represents the desired changelog entry
    Options
  3. Please describe what you did
    Options
  4. Link to relevant issues in GitHub or Jira
    Options
  5. Link to relevant pull requests, esp. upstream and downstream changes
    Options
  6. Ensure you have provided tests - that demonstrates feature works or fixes the issue
    Options

@lemeurherve lemeurherve linked an issue Oct 18, 2023 that may be closed by this pull request
@lemeurherve lemeurherve changed the title feat: use eclipse-temurin:jdk21 image Switch to GA eclipse-temurin:jdk21 image Oct 18, 2023
@lemeurherve lemeurherve marked this pull request as ready for review October 18, 2023 10:28
@lemeurherve lemeurherve requested review from ksalerno99 and a team as code owners October 18, 2023 10:28
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

I guess so

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.

LGTM. A few non blocking comments which can be addressed later.

I'm not a fan of bumping Debian version as part of this PR only for a certain subset, but it is clearly not blocker.

Note: please wait for the LTS release 2.414.3 to be finished before merging this PR

21/alpine/hotspot/Dockerfile Show resolved Hide resolved
21/debian/bookworm-slim/hotspot/Dockerfile Show resolved Hide resolved
21/debian/bookworm-slim/hotspot/Dockerfile Outdated Show resolved Hide resolved
21/debian/bookworm/hotspot/Dockerfile Show resolved Hide resolved
21/debian/bookworm/hotspot/preview/Dockerfile Show resolved Hide resolved
21/debian/bookworm/hotspot/preview/Dockerfile Show resolved Hide resolved
21/debian/bookworm/hotspot/Dockerfile Outdated Show resolved Hide resolved
lemeurherve and others added 2 commits October 18, 2023 15:55
Co-authored-by: Damien Duportal <damien.duportal@gmail.com>
@lemeurherve lemeurherve linked an issue Oct 19, 2023 that may be closed by this pull request
@lemeurherve lemeurherve merged commit 80399a3 into jenkinsci:master Oct 19, 2023
18 checks passed
@lemeurherve lemeurherve deleted the jdk21-temurin branch October 19, 2023 14:29
ti-chi-bot bot pushed a commit to PingCAP-QE/ee-ops that referenced this pull request Dec 17, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [jenkins/jenkins](https://www.jenkins.io/)
([source](https://togithub.com/jenkinsci/docker)) | minor |
`2.414.3-lts` -> `2.426.2-lts` |

---

### Release Notes

<details>
<summary>jenkinsci/docker (jenkins/jenkins)</summary>

###
[`v2.426.2`](https://togithub.com/jenkinsci/docker/releases/tag/2.426.2)

[Compare
Source](https://togithub.com/jenkinsci/docker/compare/2.426.1...2.426.2)

<!-- Optional: add a release summary here -->

#### 📦 Jenkins Core updates

- Update to Jenkins 2.426.2
([changelog](https://jenkins.io/changelog-stable/#v2.426.2))

#### 🚀 New features and improvements

- Bump Alpine Linux Version to 3.19.0
([#&#8203;1795](https://togithub.com/jenkinsci/docker/issues/1795))
[@&#8203;github-actions](https://togithub.com/github-actions)

#### 👻 Maintenance

- chore: replace `curl.exe` by `Invoke-WebRequest`
([#&#8203;1796](https://togithub.com/jenkinsci/docker/issues/1796))
[@&#8203;lemeurherve](https://togithub.com/lemeurherve)

#### 📦 Dependency updates

- chore(deps): bump plugin manager to 2.12.14
([#&#8203;1794](https://togithub.com/jenkinsci/docker/issues/1794))
[@&#8203;jenkins-dependency-updater](https://togithub.com/jenkins-dependency-updater)
- chore(deps): bump updatecli/updatecli-action from 2.49.1 to 2.50.0
([#&#8203;1793](https://togithub.com/jenkinsci/docker/issues/1793))
[@&#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump almalinux from 8.8 to 8.9 in
/11/almalinux/almalinux8/hotspot
([#&#8203;1791](https://togithub.com/jenkinsci/docker/issues/1791))
[@&#8203;dependabot](https://togithub.com/dependabot)
- Bump Debian Bookworm Linux Version to
[`2023112`](https://togithub.com/jenkinsci/docker/commit/20231120)
([#&#8203;1790](https://togithub.com/jenkinsci/docker/issues/1790))
[@&#8203;github-actions](https://togithub.com/github-actions)

#### 🐛 Bug fixes

- fix(Windows): add `lts-` prefix to LTS short tags not including
Jenkins version
([#&#8203;1784](https://togithub.com/jenkinsci/docker/issues/1784))
[@&#8203;lemeurherve](https://togithub.com/lemeurherve)

#### 📝 Documentation updates

- Add `JENKINS_PLUGIN_INFO` to the "Setting update centers" README
section
([#&#8203;1785](https://togithub.com/jenkinsci/docker/issues/1785))
[@&#8203;lemeurherve](https://togithub.com/lemeurherve)

**Full Changelog**:
jenkinsci/docker@2.426.1...2.426.2

###
[`v2.426.1`](https://togithub.com/jenkinsci/docker/releases/tag/2.426.1)

[Compare
Source](https://togithub.com/jenkinsci/docker/compare/2.414.3...2.426.1)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.426.1
([changelog](https://www.jenkins.io/changelog-stable/#v2.426.1) and
[upgrade
guide](https://www.jenkins.io/doc/upgrade-guide/2.426/#upgrading-to-jenkins-lts-2-426-1)
)

#### 💥 Breaking changes

- Remove CentOS 7 container images by
[@&#8203;MarkEWaite](https://togithub.com/MarkEWaite) in
[jenkinsci/docker#1777
- breaking(Windows): set Java 17 as default by
[@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1773

#### 🚀 New features and improvements

- feat(Windows): refactor build process by
[@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1770
- Switch from a `windowsservercore-1809` Temurin base image to a
`windowsservercore-ltsc2019` Microsoft base image
([#&#8203;1775](https://togithub.com/jenkinsci/docker/issues/1775))
- A proper set of tags is now published, and they include "ltsc2019"
instead of only "2019"
([#&#8203;1489](https://togithub.com/jenkinsci/docker/issues/1489))
- A JDK11 image is published again alongside the JDK17 one
([#&#8203;1774](https://togithub.com/jenkinsci/docker/issues/1774))
- As Java 17 is the default JDK, short tags without "jdk" in them are
using Java 17
([#&#8203;1724](https://togithub.com/jenkinsci/docker/issues/1724))
- Switch to GA eclipse-temurin:jdk21 images by
[@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1738

#### 🐛 Bug fixes

- fix: add additional tags for default Java images by
[@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1756
- fixup: shortest jdk17 tags only for weekly releases by
[@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1757

#### 📦 Dependency updates

- Bump Debian Bookworm Linux Version to
[`2023103`](https://togithub.com/jenkinsci/docker/commit/20231030) by
[@&#8203;github-actions](https://togithub.com/github-actions) in
[jenkinsci/docker#1765
- Use JDK 21.0.1+12, not 21+35 by
[@&#8203;MarkEWaite](https://togithub.com/MarkEWaite) in
[jenkinsci/docker#1779
- Bump JDK21 preview version (EA) to 21.0.1+12 by
[@&#8203;github-actions](https://togithub.com/github-actions) in
[jenkinsci/docker#1743
- Use Java 17.0.9\_9 by
[@&#8203;MarkEWaite](https://togithub.com/MarkEWaite) in
[jenkinsci/docker#1778
- Bump JDK11 version to 11.0.21\_9 by
[@&#8203;github-actions](https://togithub.com/github-actions) in
[jenkinsci/docker#1762
& [@&#8203;lemeurherve](https://togithub.com/lemeurherve) in
[jenkinsci/docker#1782
- chore(deps): bump ubi9/ubi to 9.3-1361 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[jenkinsci/docker#1776
- chore(deps): bump ubi8/ubi to 8.8-1067.1698056881 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[jenkinsci/docker#1760

**Full Changelog**:
jenkinsci/docker@2.414.3...2.426.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/PingCAP-QE/ee-ops).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuODcuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

Ship production build of Java 21 from Eclipse Temurin Arm64 alpine images
3 participants