Skip to content

Commit 6313470

Browse files
lemeurhervelemeurherve
committed
Revert "Bump default JENKINS_VERSION to Weekly 2.546 (jenkinsci#2199)"
This reverts commit 0647c5f.
1 parent 48ad25c commit 6313470

File tree

7 files changed

+32
-39
lines changed

7 files changed

+32
-39
lines changed

‎alpine/hotspot/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ RUN mkdir -p ${REF}/init.groovy.d
9595

9696
# jenkins version being bundled in this docker image
9797
ARG JENKINS_VERSION
98-
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546}
98+
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534}
9999

100100
# jenkins.war checksum, download will be validated using it
101-
ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983
101+
ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228
102102

103103
# Can be used to customize where jenkins.war get downloaded from
104104
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

‎debian/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ RUN mkdir -p ${REF}/init.groovy.d
109109

110110
# jenkins version being bundled in this docker image
111111
ARG JENKINS_VERSION
112-
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546}
112+
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534}
113113

114114
# jenkins.war checksum, download will be validated using it
115-
ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983
115+
ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228
116116

117117
# Can be used to customize where jenkins.war get downloaded from
118118
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

‎docker-bake.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ variable "default_jdk" {
2020
}
2121

2222
variable "JENKINS_VERSION" {
23-
default = "2.546"
23+
default = "2.534"
2424
}
2525

2626
variable "WAR_SHA" {
27-
default = "f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983"
27+
default = "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228"
2828
}
2929

3030
variable "WAR_URL" {

‎rhel/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ RUN curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION
9999

100100
# jenkins version being bundled in this docker image
101101
ARG JENKINS_VERSION
102-
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546}
102+
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534}
103103

104104
# jenkins.war checksum, download will be validated using it
105-
ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983
105+
ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228
106106

107107
# Can be used to customize where jenkins.war get downloaded from
108108
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

‎tests/golden/expected_tags.txt‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
docker.io/jenkins/jenkins:2.546 (debian_jdk21)
2-
docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21)
3-
docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21)
4-
docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25)
5-
docker.io/jenkins/jenkins:2.546-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
6-
docker.io/jenkins/jenkins:2.546-jdk21 (debian_jdk21)
7-
docker.io/jenkins/jenkins:2.546-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
8-
docker.io/jenkins/jenkins:2.546-jdk25 (debian_jdk25)
9-
docker.io/jenkins/jenkins:2.546-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
10-
docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk21 (rhel_jdk21)
11-
docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk25 (rhel_jdk25)
12-
docker.io/jenkins/jenkins:2.546-slim (debian-slim_jdk21)
13-
docker.io/jenkins/jenkins:2.546-slim-jdk21 (debian-slim_jdk21)
14-
docker.io/jenkins/jenkins:2.546-slim-jdk25 (debian-slim_jdk25)
1+
docker.io/jenkins/jenkins:2.534 (debian_jdk21)
2+
docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
3+
docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
4+
docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
5+
docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
6+
docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
7+
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
8+
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
9+
docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
10+
docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
11+
docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)

‎tests/golden/expected_tags_latest_weekly.txt‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
docker.io/jenkins/jenkins:2.546 (debian_jdk21)
2-
docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21)
3-
docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21)
4-
docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25)
5-
docker.io/jenkins/jenkins:2.546-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
6-
docker.io/jenkins/jenkins:2.546-jdk21 (debian_jdk21)
7-
docker.io/jenkins/jenkins:2.546-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
8-
docker.io/jenkins/jenkins:2.546-jdk25 (debian_jdk25)
9-
docker.io/jenkins/jenkins:2.546-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
10-
docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk21 (rhel_jdk21)
11-
docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk25 (rhel_jdk25)
12-
docker.io/jenkins/jenkins:2.546-slim (debian-slim_jdk21)
13-
docker.io/jenkins/jenkins:2.546-slim-jdk21 (debian-slim_jdk21)
14-
docker.io/jenkins/jenkins:2.546-slim-jdk25 (debian-slim_jdk25)
15-
docker.io/jenkins/jenkins:2.546-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
1+
docker.io/jenkins/jenkins:2.534 (debian_jdk21)
2+
docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
3+
docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
4+
docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
5+
docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
6+
docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
7+
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
8+
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
9+
docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
10+
docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
11+
docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
1612
docker.io/jenkins/jenkins:alpine (alpine_jdk21)
1713
docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21)
1814
docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25)

‎windows/windowsservercore/hotspot/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ RUN New-Item -ItemType Directory -Force -Path C:/ProgramData/Jenkins/Reference/i
9898

9999
# jenkins version being bundled in this docker image
100100
ARG JENKINS_VERSION
101-
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546}
101+
ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534}
102102

103103
# jenkins.war checksum, download will be validated using it
104-
ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983
104+
ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228
105105

106106
# Can be used to customize where jenkins.war get downloaded from
107107
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

0 commit comments

Comments
 (0)