Skip to content

feat: add linux/riscv64 platform to Debian images#2277

Open
gounthar wants to merge 4 commits intojenkinsci:masterfrom
gounthar:feat/add-riscv64-debian
Open

feat: add linux/riscv64 platform to Debian images#2277
gounthar wants to merge 4 commits intojenkinsci:masterfrom
gounthar:feat/add-riscv64-debian

Conversation

@gounthar
Copy link
Contributor

@gounthar gounthar commented Mar 17, 2026

Summary

  • Add linux/riscv64 to the default (Debian) platform list in the platforms() function of docker-bake.hcl
  • Debian-only as discussed in riscv64 docker image #2272; Alpine, RHEL, and slim variants remain unchanged

Context

Adoptium provides JDK 21 and 25 binaries for riscv64, and Debian Trixie supports the architecture natively. The jdk-download-url.sh script already handles riscv64 via uname -m without changes.

The Jenkins Docker agents already ship riscv64 images (jenkinsci/docker-agents#1168, released in v3355.v388858a_47b_33-16). This PR completes the set by adding riscv64 to the controller image.

Test plan

  • Verify docker buildx bake debian --print includes linux/riscv64 in the platforms list
  • Build Debian JDK21 image for riscv64 and verify Jenkins starts
  • Confirm Alpine, RHEL, and slim targets are unchanged

Fixes #2272

Add riscv64 to the default (Debian) platform list in the platforms()
function. Adoptium provides JDK 21 and 25 binaries for riscv64, and
Debian Trixie supports the architecture natively.

Debian-only as discussed in jenkinsci#2272 — Alpine, RHEL, and slim variants
remain unchanged.

Fixes jenkinsci#2272

Signed-off-by: Bruno Verachten <[email protected]>
@lemeurherve
Copy link
Member

Did you try make test locally? 🙂

Add riscv64 to architecturesAndCiJioAgentLabels in Jenkinsfile,
using QEMU on amd64 agents (same as ppc64le and s390x).

Signed-off-by: Bruno Verachten <[email protected]>
@gounthar
Copy link
Contributor Author

gounthar commented Mar 17, 2026

@lemeurherve Fair point, I missed the Jenkinsfile. Added riscv64 to architecturesAndCiJioAgentLabels using QEMU on amd64, same as ppc64le and s390x. Should fix the CI failures.

@lemeurherve
Copy link
Member

@lemeurherve Fair point, I missed the Jenkinsfile. Added riscv64 to architecturesAndCiJioAgentLabels using QEMU on amd64, same as ppc64le and s390x. Should fix the CI failures.

That wasn't my point 😉

I encourage you to actually run make test locally.

@gounthar
Copy link
Contributor Author

It's been running for a while now...

Add debian_jdk{21,25}:linux/riscv64 to the expected platforms golden
file to match the updated platforms() function in docker-bake.hcl.

Signed-off-by: Bruno Verachten <[email protected]>
@lemeurherve
Copy link
Member

It's been running for a while now...

Possible, better to be done before opening a PR.

@gounthar
Copy link
Contributor Author

gounthar commented Mar 17, 2026

Yes, but it’s just a draft. You’re right, nonetheless, I opened it before make test had finished (and failed).

@gounthar
Copy link
Contributor Author

gounthar commented Mar 17, 2026

@lemeurherve Verified locally: make test succeeds, and make --silent platforms output matches the updated golden file. Also added riscv64 to architecturesAndCiJioAgentLabels in the Jenkinsfile (QEMU on amd64, same as ppc64le/s390x).

No reason to exclude riscv64 from slim when full Debian has it.
The base image (debian:trixie-slim) supports riscv64.

Signed-off-by: Bruno Verachten <[email protected]>
Copy link
Member

@lemeurherve lemeurherve left a comment

Choose a reason for hiding this comment

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

Changes LGTM, thanks @gounthar!

Requesting changes to avoid merging this PR before the Weekly and LTS security releases of Wednesday. (can't check its publication before)

@gounthar
Copy link
Contributor Author

Of course.

Thanks a lot for the review! 👍

Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

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

Change looks good to me. Ready to merge and release after the security release is complete.

@gounthar gounthar marked this pull request as ready for review March 18, 2026 13:53
@gounthar gounthar requested a review from a team as a code owner March 18, 2026 13:53
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.

riscv64 docker image

3 participants