expected_tags.txt OK

Author: lemeurherve

docker-bake.hcl

@@ -337,15 +337,15 @@ function "windows_tags" {
   params = [distribution, jdk]
   result = [
     ## Always publish explicit jdk tag
-    tag(true, "${distribution}-jdk${jdk}"),
-    tag_weekly(false, "${distribution}-jdk${jdk}"),
-    tag_lts(false, "lts-${distribution}-jdk${jdk}"),
-
-    ## Default JDK extra short tags
-    is_default_jdk(jdk) ? tag(true, distribution) : "",
-    is_default_jdk(jdk) ? tag_weekly(false, distribution) : "",
-    is_default_jdk(jdk) ? tag_lts(false, "lts-${distribution}") : "",
-    is_default_jdk(jdk) ? tag_lts(true, "lts-${distribution}") : "",
+    tag(true, "jdk${jdk}-hotspot-${distribution}"), # OK
+    # 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
+    # is_default_jdk(jdk) ? tag_weekly(false, distribution) : "",
+    # is_default_jdk(jdk) ? tag_lts(false, "lts-${distribution}") : "",
+    # is_default_jdk(jdk) ? tag_lts(true, "lts-${distribution}") : "",
   ]
 }
 

tests/golden/expected_tags.txt

@@ -3,16 +3,17 @@ docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
+docker.io/jenkins/jenkins:2.534-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17)
+docker.io/jenkins/jenkins:2.534-jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk17)
 docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
-docker.io/jenkins/jenkins:2.534-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
+docker.io/jenkins/jenkins:2.534-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk25)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
-docker.io/jenkins/jenkins:windowsservercore-ltsc2022 (windowsservercore_jdk21 - not sure - no 2.543 prefix? - what's the `latest` windows?)