feat(Linux): switch supported architectures to GA Temurin jdk21 images #521

lemeurherve · 2023-10-12T07:56:44Z

This PR switch supported architectures (x86 & arm64) to the GA jdk21 Temurin Linux images.

It keeps jdk21-preview images for unsupported architectures (ppc64le, arm32 and s390x).

It also include a fix for the preview (EA) release download URL.

Follow-up of #518

~~Depending on #520 decision about archlinux, I could add an archlinux-jdk21 image too.~~ removed from that PR.

Testing done

https://ci.jenkins.io/job/Packaging/job/docker-agent/job/PR-521/32/

Submitter checklist

Give feedback

Make sure you are opening from a **topic/feature/bugfix branch** (right side) and not your main branch!

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Options
Successfully updated the issue's project

There was an error updating the issue's project
Ensure that the pull request title represents the desired changelog entry

Ensure that the pull request title represents the desired changelog entry
Options
Successfully updated the issue's project

There was an error updating the issue's project
Please describe what you did

Please describe what you did
Options
Successfully updated the issue's project

There was an error updating the issue's project
Link to relevant issues in GitHub or Jira

Link to relevant issues in GitHub or Jira
Options
Successfully updated the issue's project

There was an error updating the issue's project
Link to relevant pull requests, esp. upstream and downstream changes

Link to relevant pull requests, esp. upstream and downstream changes
Options
Successfully updated the issue's project

There was an error updating the issue's project
Ensure you have provided tests - that demonstrates feature works or fixes the issue

Ensure you have provided tests - that demonstrates feature works or fixes the issue
Options
Successfully updated the issue's project

There was an error updating the issue's project
Options

gounthar

Maybe we should wait, then, until they become available.

lemeurherve · 2023-10-12T09:29:27Z

Maybe we should wait, then, until they become available.

I can rework my PR to keep linux-arm32 and linux-ppc64le as jdk21-preview images, WDYT?

EDIT: done.

timja

~~use a multi-arch image to retrieve the jdk please instead of fetching it via wget like we do in all other images~~

I was looking at an old diff

docker-bake.hcl

timja · 2023-10-12T09:57:53Z

docker-bake.hcl

+    "${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
+  ]
+  platforms = ["linux/amd64", "linux/arm64"]


I would probably just wait a couple of days they probably won't take long to produce the other platforms?

lemeurherve · 2023-10-12T10:01:09Z

Maybe we should wait, then, until they become available.

I can rework my PR to keep linux-arm32 and linux-ppc64le as jdk21-preview images, WDYT?

EDIT: done.

There aren't any binaries for these architectures in recent releases (https://github.com/adoptium/temurin21-binaries/releases).

To keep preview images for these specific architecture without blocking the major ones, I propose to use the (fixed) last release where they're available in

docker-agent/debian/21/Dockerfile

Lines 8 to 19 in f8e2ca6

    
           RUN set -x; apt-get update \ 
        
             && apt-get install --no-install-recommends -y \ 
        
               ca-certificates \ 
        
               jq \ 
        
               wget \ 
        
             && BUILD_NUMBER=$(echo $JAVA_VERSION | cut -d'+' -f2) \ 
        
             && JAVA_MAJOR_VERSION=$(echo $JAVA_VERSION | cut -d'+' -f1) \ 
        
             && JAVA_VERSION_ENCODED=$(echo "$JAVA_VERSION" | jq "@uri" -jRr) \ 
        
             && CONVERTED_ARCH=$(arch | sed -e 's/x86_64/x64/' -e 's/armv7l/arm/') \ 
        
             && wget --quiet https://github.com/adoptium/temurin"${JAVA_MAJOR_VERSION}"-binaries/releases/download/jdk-"${JAVA_VERSION_ENCODED}"-ea-beta/OpenJDK"${JAVA_MAJOR_VERSION}"U-jdk_"${CONVERTED_ARCH}"_linux_hotspot_ea_"${JAVA_MAJOR_VERSION}"-0-"${BUILD_NUMBER}".tar.gz -O /tmp/jdk.tar.gz \ 
        
             && tar -xzf /tmp/jdk.tar.gz -C /opt/ \ 
        
             && rm -f /tmp/jdk.tar.gz

WDYT?

lemeurherve · 2023-10-12T10:02:35Z

We can also wait a few days.

timja · 2023-10-12T10:14:46Z

We can also wait a few days.

I would prefer to just wait a few days they should come out soon

gounthar · 2023-10-12T12:06:46Z

Thank you.
Here is the current status found here.

⛔ means there is no build planned for that version/platform combination. 🤔
Could we wait for arm32, ppc64le and x64 Windows to go?

There is an explanation in a Temurin repo where they describe the different classes of platforms they support.
I guess s390x is in the last group.

Quote from Temurin, a few minutes ago:

As things stand we are unable to ship a JDK21 build for s390x. We are hopeful that we might be able to ship a build of 21.0.1 with support for s390x

lemeurherve · 2023-10-12T12:20:55Z

Thank you. Here is the current status found here.

Thanks for the link, quite useful!

Could we wait for arm32, ppc64le [...] to go?

Yes, I'll keep this PR as draft until arm32 & ppc64le images variants are ready.

and x64 Windows

Unrelated to this PR concerning Linux images.

We're already publishing amd64 Windows images (see https://hub.docker.com/r/jenkins/agent/tags?page=1&name=21), which AFAIU are the same architecture.

I can't find the right link at the moment, but there is an explanation somewhere in a Temurin repo where they describe the different classes of platforms they support. I guess s390x is in the last group.

I've removed s390x target architecture for jdk21 as it won't be supported in commit 2d4b319

lemeurherve · 2023-10-20T06:48:54Z

adoptium/temurin#8 has been closed, and the October release status doesn't look good for the architectures we were waiting for: adoptium/temurin#6

With these new elements at hand, are you OK if I restore a similar workaround as the one deployed in jenkinsci/docker#1738 to keep the preview tags/images like in 2eae836?

MarkEWaite · 2023-10-20T10:44:04Z

I think that the workaround is a very reasonable compromise.

dduportal · 2023-10-20T10:59:14Z

+1 with the workaround! Will be double justified as there is a ne EA release for s390x for instance, as pointed by @gounthar : https://github.com/adoptium/temurin21-binaries/releases/tag/jdk-21.0.1%2B12-ea-beta

gounthar · 2023-10-20T12:19:23Z

Yes, ppc64le, s390x and armv7 are available for the JDK 21.0.1 early access.

lemeurherve · 2023-10-20T12:40:08Z

I'll prepare the workaround, then as follow-up of this PR I'll prepare another one for updatecli manifests managing both type of versions like jenkinsci/docker#1741

…able in eclipse-temurin images

…1 image

…emurin:21 image" "also remove linux-s390x for jdk21" "remove linux-arm32 and linux-ppc64le architectures for jdk21, unavailable in eclipse-temurin images" This reverts commits bce36e2, d154f2e and a900d2d

This reverts commit e47db5e.

…clipse-temurin:21 image" "also remove linux-s390x for jdk21" "remove linux-arm32 and linux-ppc64le architectures for jdk21, unavailable in eclipse-temurin images"" This reverts commit 3a9d480.

…e provided by the official jdk21 image

…/docker#1747

…s particular version release URL

lemeurherve · 2023-10-22T17:16:25Z

Included back the workaround, and also incorporated the same kind of preview (EA) release download URL fix as jenkinsci/docker#1747

PR ready for review, to be squashed.

lemeurherve · 2023-10-22T21:58:26Z

I'll prepare the workaround, then as follow-up of this PR I'll prepare another one for updatecli manifests managing both type of versions like jenkinsci/docker#1741

Updatecli manifests update addressed in #536

lemeurherve added enhancement alpine-linux jdk21 debian-linux labels Oct 12, 2023

gounthar reviewed Oct 12, 2023

View reviewed changes

timja requested changes Oct 12, 2023

View reviewed changes

timja reviewed Oct 12, 2023

View reviewed changes

docker-bake.hcl Show resolved Hide resolved

timja reviewed Oct 12, 2023

View reviewed changes

timja approved these changes Oct 12, 2023

View reviewed changes

lemeurherve mentioned this pull request Oct 17, 2023

Ship production build of Java 21 from Eclipse Temurin jenkinsci/docker#1737

Closed

lemeurherve force-pushed the jdk21 branch from 6db1992 to e47db5e Compare October 17, 2023 18:04

lemeurherve added 8 commits October 22, 2023 13:30

feat(Linux): add Java 21

a229a44

fix jdk21 version in docker-bake and updatecli script

dac97be

remove linux-arm32 and linux-ppc64le architectures for jdk21, unavail…

c8a27eb

…able in eclipse-temurin images

also remove linux-s390x for jdk21

8fa815e

keep jdk21-preview for architectures unsupported by eclipse-temurin:2…

5c62d0d

…1 image

update jdk21 updatecli manifest

2777001

Revert "keep jdk21-preview for architectures unsupported by eclipse-t…

4a41fcc

…emurin:21 image" "also remove linux-s390x for jdk21" "remove linux-arm32 and linux-ppc64le architectures for jdk21, unavailable in eclipse-temurin images" This reverts commits bce36e2, d154f2e and a900d2d

remove s390x target architecture for jdk21 as temurin won't support it

7b24f4e

lemeurherve added 5 commits October 22, 2023 13:30

try out the two available architectures for now

81935bd

restore updatecli folder for now

cb315b3

Revert "try out the two available architectures for now"

378d786

This reverts commit e47db5e.

Revert "Revert "keep jdk21-preview for architectures unsupported by e…

fbe1d15

…clipse-temurin:21 image" "also remove linux-s390x for jdk21" "remove linux-arm32 and linux-ppc64le architectures for jdk21, unavailable in eclipse-temurin images"" This reverts commit 3a9d480.

rename '21' folder to 'preview'

d5e7adc

lemeurherve force-pushed the jdk21 branch from 86abc05 to d5e7adc Compare October 22, 2023 11:30

lemeurherve added 5 commits October 22, 2023 13:31

restore change

5436b82

remove alpine preview version, not needed as its two architectures ar…

20e4ec8

…e provided by the official jdk21 image

add distinct JAVA21_PREVIEW_VERSION

db8aada

fix jdk21-preview Dockerfile location

ca5a30b

add debian_jdk21_preview to the linux targets group

4c50885

lemeurherve changed the title ~~feat(Linux): add Java 21~~ feat(Linux): switch supported architectures to GA Temurin jdk21 images Oct 22, 2023

lemeurherve added 6 commits October 22, 2023 15:12

apply same fix for preview (EA) release download link as in jenkinsci…

0a490c2

…/docker#1747

special case for preview (EA) version '21_35', no 'ea_' prefix in thi…

f0bfe76

…s particular version release URL

add hadolint ignore DL3008 (no pinned versions with apt-get install)

c8ff087

fix 21_35 special case

6d78e4b

same player try again

26d3f88

cleanup

db2eb9e

lemeurherve marked this pull request as ready for review October 22, 2023 17:15

lemeurherve requested a review from a team as a code owner October 22, 2023 17:15

lemeurherve mentioned this pull request Oct 22, 2023

feat(Linux): switch supported architectures to GA Temurin jdk21 images jenkinsci/docker-inbound-agent#436

Merged

lemeurherve requested a review from dduportal October 22, 2023 18:45

dduportal approved these changes Oct 22, 2023

View reviewed changes

dduportal merged commit c9614be into jenkinsci:master Oct 22, 2023
10 checks passed

dduportal mentioned this pull request Oct 22, 2023

chore(updatecli) remove reference to a deleted file for Alpine #535

Merged

lemeurherve deleted the jdk21 branch October 22, 2023 19:42

This was referenced Oct 22, 2023

fix(updatecli): check preview parent images only for some architectures jenkinsci/docker-inbound-agent#437

Merged

chore(updatecli): add jdk21-preview manifest and adapt check-jdk.sh script #536

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(Linux): switch supported architectures to GA Temurin jdk21 images #521

feat(Linux): switch supported architectures to GA Temurin jdk21 images #521

lemeurherve commented Oct 12, 2023 •

edited

Submitter checklist

gounthar left a comment

lemeurherve commented Oct 12, 2023 •

edited

timja left a comment •

edited

timja Oct 12, 2023

lemeurherve commented Oct 12, 2023 •

edited

lemeurherve commented Oct 12, 2023

timja commented Oct 12, 2023

gounthar commented Oct 12, 2023 •

edited

lemeurherve commented Oct 12, 2023 •

edited

lemeurherve commented Oct 20, 2023

MarkEWaite commented Oct 20, 2023

dduportal commented Oct 20, 2023

gounthar commented Oct 20, 2023

lemeurherve commented Oct 20, 2023

lemeurherve commented Oct 22, 2023

lemeurherve commented Oct 22, 2023

feat(Linux): switch supported architectures to GA Temurin jdk21 images #521

feat(Linux): switch supported architectures to GA Temurin jdk21 images #521

Conversation

lemeurherve commented Oct 12, 2023 • edited

Testing done

Submitter checklist

gounthar left a comment

Choose a reason for hiding this comment

lemeurherve commented Oct 12, 2023 • edited

timja left a comment • edited

Choose a reason for hiding this comment

timja Oct 12, 2023

Choose a reason for hiding this comment

lemeurherve commented Oct 12, 2023 • edited

lemeurherve commented Oct 12, 2023

timja commented Oct 12, 2023

gounthar commented Oct 12, 2023 • edited

lemeurherve commented Oct 12, 2023 • edited

lemeurherve commented Oct 20, 2023

MarkEWaite commented Oct 20, 2023

dduportal commented Oct 20, 2023

gounthar commented Oct 20, 2023

lemeurherve commented Oct 20, 2023

lemeurherve commented Oct 22, 2023

lemeurherve commented Oct 22, 2023

lemeurherve commented Oct 12, 2023 •

edited

lemeurherve commented Oct 12, 2023 •

edited

timja left a comment •

edited

lemeurherve commented Oct 12, 2023 •

edited

gounthar commented Oct 12, 2023 •

edited

lemeurherve commented Oct 12, 2023 •

edited