Skip to content

chore(updatecli): add missing target and relax match pattern in JENKINS_VERSION manifest#2201

Merged
lemeurherve merged 3 commits intojenkinsci:masterfrom
lemeurherve:fix-jenkins-version-sha-and-short-tag
Jan 16, 2026
Merged

chore(updatecli): add missing target and relax match pattern in JENKINS_VERSION manifest#2201
lemeurherve merged 3 commits intojenkinsci:masterfrom
lemeurherve:fix-jenkins-version-sha-and-short-tag

Conversation

@lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented Jan 15, 2026

This change fixes the manifest by adding the missing target updating WAR_SHA value in the Dockerfiles, and by relaxing the match pattern used for golden files to also update the short tags.

It also adds skip-changelog label to the action, as bumps from this manifest are equivalent to a noop in term of content in the published image.

Amends:

Ref:

Testing done

updatecli diff --debug --clean --config ./updatecli/updatecli.d/jenkins-version.yaml --values ./updatecli/values.github-action.yaml
--- tests/golden/expected_tags.txt
+++ tests/golden/expected_tags.txt
@@ -1,4 +1,4 @@
-docker.io/jenkins/jenkins:2.534 (debian_jdk21)
+docker.io/jenkins/jenkins:2.546 (debian_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25)

--- tests/golden/expected_tags_latest_weekly.txt
+++ tests/golden/expected_tags_latest_weekly.txt
@@ -1,4 +1,4 @@
-docker.io/jenkins/jenkins:2.534 (debian_jdk21)
+docker.io/jenkins/jenkins:2.546 (debian_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25)

🐋 On (Docker)file "alpine/hotspot/Dockerfile":
⚠ The line #101, matched by the keyword "ARG" and the matcher "WAR_SHA", is changed from "ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228" to "ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983".

🐋 On (Docker)file "debian/Dockerfile":
⚠ The line #115, matched by the keyword "ARG" and the matcher "WAR_SHA", is changed from "ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228" to "ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983".

🐋 On (Docker)file "rhel/Dockerfile":
⚠ The line #105, matched by the keyword "ARG" and the matcher "WAR_SHA", is changed from "ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228" to "ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983".

🐋 On (Docker)file "windows/windowsservercore/hotspot/Dockerfile":
⚠ The line #104, matched by the keyword "ARG" and the matcher "WAR_SHA", is changed from "ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228" to "ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983".

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests that demonstrate the feature works or the issue is fixed

@lemeurherve lemeurherve requested a review from a team as a code owner January 15, 2026 23:12
@lemeurherve lemeurherve changed the title chore(updatecli): add missing target and relax match pattern in \JENKINS_VERSION\ manifest chore(updatecli): add missing target and relax match pattern in JENKINS_VERSION manifest Jan 15, 2026
@lemeurherve lemeurherve enabled auto-merge (squash) January 15, 2026 23:30
@lemeurherve lemeurherve merged commit 089a2eb into jenkinsci:master Jan 16, 2026
12 checks passed
@lemeurherve lemeurherve deleted the fix-jenkins-version-sha-and-short-tag branch January 16, 2026 00:35
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.

2 participants