expected_tags_weekly OK (some tags added)

Author: lemeurherve

docker-bake.hcl

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

tests/golden/expected_tags_latest_weekly.txt

@@ -3,11 +3,13 @@ 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)
@@ -24,11 +26,11 @@ docker.io/jenkins/jenkins:alpine3.23-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:alpine3.23-jdk21 (alpine_jdk21)
 docker.io/jenkins/jenkins:alpine3.23-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:jdk17 (debian_jdk17)
-docker.io/jenkins/jenkins:jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
+docker.io/jenkins/jenkins:jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk17)
 docker.io/jenkins/jenkins:jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
 docker.io/jenkins/jenkins:jdk25 (debian_jdk25)
-docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk21)
+docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore_jdk25)
 docker.io/jenkins/jenkins:latest (debian_jdk21)
 docker.io/jenkins/jenkins:latest-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:latest-jdk21 (debian_jdk21)