Skip to content

[pull] master from jenkinsci:master #725

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.

Sign up for GitHub

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

Merged
pull merged 5 commits into from
Jul 14, 2026
Merged

[pull] master from jenkinsci:master #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
763bf52
Bump RHEL version to 9.8-1784004572 (#2408)
github-actions[bot] Jul 14, 2026
17c9be6
Bump Debian version to 20260713 (#2406)
github-actions[bot] Jul 14, 2026
a205617
fix(windows): use `gpgv` instead of `gpg` for signature verification …
lemeurherve Jul 14, 2026
883103e
Bump default `JENKINS_VERSION` to Weekly 2.573 (#2407)
github-actions[bot] Jul 14, 2026
be78bf9
chore: remove obsolete Windows flavor TODO comment (#2410)
Piyush0049 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alpine/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
fi

# Jenkins version being bundled in this docker image
ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

Expand Down Expand Up @@ -137,7 +137,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support
COPY jenkins.sh /usr/local/bin/jenkins.sh
COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli

ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
6 changes: 3 additions & 3 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG TRIXIE_TAG=20251103

ARG DEBIAN_RELEASE_LINE=trixie
ARG DEBIAN_VERSION=20260623
ARG DEBIAN_VERSION=20260713
ARG DEBIAN_VARIANT="-slim"
FROM debian:"${DEBIAN_RELEASE_LINE}-${DEBIAN_VERSION}${DEBIAN_VARIANT}" AS jre-and-war

Expand Down Expand Up @@ -45,7 +45,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
fi

# Jenkins version being bundled in this docker image
ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

Expand Down Expand Up @@ -151,7 +151,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support
COPY jenkins.sh /usr/local/bin/jenkins.sh
COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli

ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
6 changes: 3 additions & 3 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variable "default_jdk" {
}

variable "JENKINS_VERSION" {
default = "2.572"
default = "2.573"
}

variable "WAR_URL" {
Expand Down Expand Up @@ -64,11 +64,11 @@ variable "DEBIAN_RELEASE_LINE" {
}

variable "DEBIAN_VERSION" {
default = 20260623
default = 20260713
}

variable "RHEL_TAG" {
default = "9.8-1782841664"
default = "9.8-1784004572"
}

variable "RHEL_RELEASE_LINE" {
Expand Down
2 changes: 1 addition & 1 deletion make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Param(
# Default script target
[String] $Target = 'build',
# Jenkins version to include
[String] $JenkinsVersion = '2.572',
[String] $JenkinsVersion = '2.573',
# Windows flavor and windows version to build
[String] $ImageType = 'windowsservercore-ltsc2022',
# Generate a docker compose file even if it already exists
Expand Down
6 changes: 3 additions & 3 deletions rhel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RHEL_TAG=9.8-1782841664
ARG RHEL_TAG=9.8-1784004572
ARG RHEL_RELEASE_LINE=ubi9
FROM registry.access.redhat.com/${RHEL_RELEASE_LINE}/ubi:${RHEL_TAG} AS jre-and-war

Expand Down Expand Up @@ -40,7 +40,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
fi

# Jenkins version being bundled in this docker image
ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

Expand Down Expand Up @@ -141,7 +141,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support
COPY jenkins.sh /usr/local/bin/jenkins.sh
COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli

ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/expected_env_vars_except_hostname.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ JENKINS_INCREMENTALS_REPO_MIRROR=https://repo.jenkins-ci.org/incrementals
JENKINS_SLAVE_AGENT_PORT=50000
JENKINS_UC=https://updates.jenkins.io
JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental
JENKINS_VERSION=2.572
JENKINS_VERSION=2.573
LANG=C.UTF-8
PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
Expand Down
34 changes: 17 additions & 17 deletions tests/golden/expected_tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
docker.io/jenkins/jenkins:2.572 (debian_jdk21)
docker.io/jenkins/jenkins:2.572-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.572-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.572-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.572-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.572-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.572-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.572-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.573 (debian_jdk21)
docker.io/jenkins/jenkins:2.573-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.573-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.573-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.573-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.573-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.573-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.573-slim-jdk25 (debian-slim_jdk25)
38 changes: 19 additions & 19 deletions tests/golden/expected_tags_latest_weekly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
docker.io/jenkins/jenkins:2.572 (debian_jdk21)
docker.io/jenkins/jenkins:2.572-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.572-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.572-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.572-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.572-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.572-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.572-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.572-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.572-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.573 (debian_jdk21)
docker.io/jenkins/jenkins:2.573-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.573-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.573-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.573-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.573-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.573-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.573-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.573-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.573-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:alpine (alpine_jdk21)
docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25)
Expand Down
1 change: 0 additions & 1 deletion tests/test_helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function Retry-Command {
}

function Get-SutImage {
# TODO: don't hardcode Windows flavor
$DOCKERFILE = 'windows/windowsservercore/hotspot/Dockerfile'
$IMAGETAG = Get-EnvOrDefault 'CONTROLLER_TAG' ''

Expand Down
8 changes: 4 additions & 4 deletions windows/windowsservercore/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN New-Item -ItemType Directory -Path C:/temp | Out-Null ; `
Remove-Item -Path C:\temp -Recurse | Out-Null

# Jenkins version being bundled in this docker image
ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war
ENV WAR_URL=${WAR_URL}
Expand All @@ -68,8 +68,8 @@ RUN New-Item -ItemType Directory -Path C:/war | Out-Null ; `
COPY jenkins.io-2026.key /war/jenkins-key.pub

RUN & 'C:/Program Files/GnuPG/bin/gpg.exe' --version ; `
& 'C:/Program Files/GnuPG/bin/gpg.exe' --import C:/war/jenkins-key.pub ; `
& 'C:/Program Files/GnuPG/bin/gpg.exe' --verify --trust-model direct C:/war/jenkins.war.asc C:/war/jenkins.war
& 'C:/Program Files/GnuPG/bin/gpg.exe' --dearmor --output C:/war/jenkins-key.pgp C:/war/jenkins-key.pub ; `
& 'C:/Program Files/GnuPG/bin/gpgv.exe' --keyring C:/war/jenkins-key.pgp C:/war/jenkins.war.asc C:/war/jenkins.war

FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS controller

Expand Down Expand Up @@ -145,7 +145,7 @@ COPY jenkins.ps1 C:/ProgramData/Jenkins
# See https://github.com/jenkinsci/plugin-installation-manager-tool#cli-options for information on parameters for jenkins-plugin-cli.ps1 for installing plugins into the docker image
COPY jenkins-plugin-cli.ps1 C:/ProgramData/Jenkins

ARG JENKINS_VERSION=2.572
ARG JENKINS_VERSION=2.573
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["powershell.exe", "-f", "C:/ProgramData/Jenkins/jenkins.ps1"]
Expand Down