chore(bake): remove Weekly/LTS differenciations (jenkinsci#2228)

Author: lemeurherve

docker-bake.hcl

@@ -215,6 +215,15 @@ group "all" {
 }
 
 ## Common functions
+# return true if JENKINS_VERSION is a Weekly (one sequence of digits with a trailing literal '.')
+function "is_jenkins_version_weekly" {
+  # If JENKINS_VERSION has more than one sequence of digits with a trailing literal '.', this is LTS
+  # 2.523 has only one sequence of digits with a trailing literal '.'
+  # 2.516.1 has two sequences of digits with a trailing literal '.'
+  params = []
+  result = length(regexall("[0-9]+[.]", JENKINS_VERSION)) < 2 ? true : false
+}
+
 # return a tag prefixed by the Jenkins version
 function "_tag_jenkins_version" {
   params = [tag]
@@ -241,13 +250,10 @@ function "tag_lts" {
 
 # return WAR_URL if not empty, get.jenkins.io URL depending on JENKINS_VERSION release line otherwise
 function "war_url" {
-  # If JENKINS_VERSION has more than one sequence of digits with a trailing literal '.', this is LTS
-  # 2.523 has only one sequence of digits with a trailing literal '.'
-  # 2.516.1 has two sequences of digits with a trailing literal '.'
   params = []
   result = (notequal(WAR_URL, "")
     ? WAR_URL
-    : (length(regexall("[0-9]+[.]", JENKINS_VERSION)) < 2
+    : (is_jenkins_version_weekly()
       ? "https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war"
   : "https://get.jenkins.io/war-stable/${JENKINS_VERSION}/jenkins.war"))
 }
@@ -400,11 +406,9 @@ function "debian_tags" {
 }
 
 # Return array of Windows version(s) to build
-# Can be overriden by setting WINDOWS_VERSION_OVERRIDE to a specific Windows version
+# Can be overridden by setting WINDOWS_VERSION_OVERRIDE to a specific Windows version
 # Ex: WINDOWS_VERSION_OVERRIDE=ltsc2025 docker buildx bake windows
 function "windowsversions" {
   params = []
-  result = (notequal(WINDOWS_VERSION_OVERRIDE, "")
-    ? [WINDOWS_VERSION_OVERRIDE]
-    : windows_version_to_build)
+  result = notequal(WINDOWS_VERSION_OVERRIDE, "") ? [WINDOWS_VERSION_OVERRIDE] : windows_version_to_build
 }

tests/golden/expected_tags_latest_lts.txt

@@ -34,23 +34,17 @@ docker.io/jenkins/jenkins:2.504.3-windowsservercore-ltsc2019 (windowsservercore-
 docker.io/jenkins/jenkins:2.504.3-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
 docker.io/jenkins/jenkins:lts (debian_jdk21)
 docker.io/jenkins/jenkins:lts-alpine (alpine_jdk21)
-docker.io/jenkins/jenkins:lts-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:lts-alpine-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:lts-alpine-jdk25 (alpine_jdk25)
-docker.io/jenkins/jenkins:lts-jdk17 (debian_jdk17)
-docker.io/jenkins/jenkins:lts-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
-docker.io/jenkins/jenkins:lts-jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk17)
 docker.io/jenkins/jenkins:lts-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
 docker.io/jenkins/jenkins:lts-jdk25 (debian_jdk25)
 docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
-docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk21 (rhel_jdk21)
 docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:lts-slim (debian-slim_jdk21)
-docker.io/jenkins/jenkins:lts-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:lts-slim-jdk21 (debian-slim_jdk21)
 docker.io/jenkins/jenkins:lts-slim-jdk25 (debian-slim_jdk25)
 docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)