expected_tags_lts OK (add 1 tag)

Author: lemeurherve

docker-bake.hcl

@@ -330,45 +330,25 @@ function "linux_tags" {
   )
 }
 
-# TODO: not correct yet, to be revised
 # Return an array of tags depending on the agent type, the jdk
 # and the flavor and version of Windows passed as parameters (ex: windowsservercore-ltsc2022)
 function "windows_tags" {
   params = [distribution, jdk]
   result = [
     ## Always publish explicit jdk tag
-    tag(true, "jdk${jdk}-hotspot-${distribution}"), # OK
-    tag_weekly(false, "jdk${jdk}-hotspot-${distribution}"), # OK
+    tag(true, "jdk${jdk}-hotspot-${distribution}"),
+    tag_weekly(false, "jdk${jdk}-hotspot-${distribution}"),
     tag_lts(false, "lts-jdk${jdk}-hotspot-${distribution}"),
 
     # ## Default JDK extra short tags
-    is_default_jdk(jdk) ? tag(true, "hotspot-${distribution}") : "", # OK but KO for Weekly (2.534-hotspot-windowsservercore-ltsc2022 too much)
-    is_default_jdk(jdk) ? tag_weekly(false, distribution) : "", # OK
-    is_default_jdk(jdk) ? tag_weekly(true, distribution) : "", # OK
+    is_default_jdk(jdk) ? tag(true, "hotspot-${distribution}") : "",
+    is_default_jdk(jdk) ? tag_weekly(false, distribution) : "",
+    is_default_jdk(jdk) ? tag_weekly(true, distribution) : "",
     is_default_jdk(jdk) ? tag_lts(false, "lts-${distribution}") : "",
-    is_default_jdk(jdk) ? tag_lts(true, "lts-${distribution}") : "",
+    is_default_jdk(jdk) ? tag_lts(true, distribution) : "",
   ]
 }
 
-## Tags from Docker Hub (extracted on 2026-01-07)
-# Weekly
-# docker.io/jenkins/jenkins:2.528.3-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk17)
-# docker.io/jenkins/jenkins:2.528.3-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk21)
-# docker.io/jenkins/jenkins:2.528.3-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk25)
-# docker.io/jenkins/jenkins:2.528.3-windowsservercore-ltsc2019 (windowsservercore_jdk21)
-# docker.io/jenkins/jenkins:lts-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk17)
-# docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk21)
-# docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore_jdk25)
-# docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019 (windowsservercore_jdk21)
-
-# LTS
-# docker.io/jenkins/jenkins:2.528.3-jdk17-hotspot-windowsservercore-ltsc2019
-# docker.io/jenkins/jenkins:2.528.3-jdk21-hotspot-windowsservercore-ltsc2019
-# docker.io/jenkins/jenkins:2.528.3-windowsservercore-ltsc2019
-# docker.io/jenkins/jenkins:lts-jdk17-hotspot-windowsservercore-ltsc2019
-# docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019
-# docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019
-
 # Return if the distribution passed in parameter is Alpine
 function "is_alpine" {
   params = [distribution]

tests/golden/expected_tags_latest_lts.txt

@@ -3,6 +3,7 @@ docker.io/jenkins/jenkins:2.504.3-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.504.3-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:2.504.3-alpine-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:2.504.3-alpine-jdk25 (alpine_jdk25)
+docker.io/jenkins/jenkins:2.504.3-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
 docker.io/jenkins/jenkins:2.504.3-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:2.504.3-jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk17)
 docker.io/jenkins/jenkins:2.504.3-jdk21 (debian_jdk21)