chore(bake): remove Weekly/LTS differenciations

Author: lemeurherve

docker-bake.hcl

@@ -1,17 +1,9 @@
 ## Variables
-variable "jdks_to_build_for_lts" {
-  default = [17, 21, 25]
-}
-
-variable "jdks_to_build_for_weekly" {
+variable "jdks_to_build" {
   default = [21, 25]
 }
 
-variable "windows_version_to_build_for_lts" {
-  default = ["windowsservercore-ltsc2019", "windowsservercore-ltsc2022"]
-}
-
-variable "windows_version_to_build_for_weekly" {
+variable "windows_version_to_build" {
   default = ["windowsservercore-ltsc2019", "windowsservercore-ltsc2022"]
 }
 
@@ -116,7 +108,7 @@ variable "current_rhel" {
 ## Targets
 target "alpine" {
   matrix = {
-    jdk = jdks_to_build()
+    jdk = jdks_to_build
   }
   name       = "alpine_jdk${jdk}"
   dockerfile = "alpine/hotspot/Dockerfile"
@@ -136,7 +128,7 @@ target "alpine" {
 
 target "debian" {
   matrix = {
-    jdk     = jdks_to_build()
+    jdk     = jdks_to_build
     variant = debian_variants
   }
   name       = "${variant}_jdk${jdk}"
@@ -159,7 +151,7 @@ target "debian" {
 
 target "rhel" {
   matrix = {
-    jdk = jdks_to_build()
+    jdk = jdks_to_build
   }
   name       = "rhel_jdk${jdk}"
   dockerfile = "rhel/Dockerfile"
@@ -180,7 +172,7 @@ target "rhel" {
 
 target "windowsservercore" {
   matrix = {
-    jdk             = jdks_to_build()
+    jdk             = jdks_to_build
     windows_version = windowsversions()
   }
   name       = "${windows_version}_jdk${jdk}"
@@ -232,12 +224,6 @@ function "is_jenkins_version_weekly" {
   result = length(regexall("[0-9]+[.]", JENKINS_VERSION)) < 2 ? true : false
 }
 
-# return the list of jdk to build depending on JENKINS_VERSION
-function "jdks_to_build" {
-  params = []
-  result = is_jenkins_version_weekly() ? jdks_to_build_for_weekly : jdks_to_build_for_lts
-}
-
 # return a tag prefixed by the Jenkins version
 function "_tag_jenkins_version" {
   params = [tag]
@@ -424,7 +410,5 @@ function "debian_tags" {
 # Ex: WINDOWS_VERSION_OVERRIDE=ltsc2025 docker buildx bake windows
 function "windowsversions" {
   params = []
-  result = (notequal(WINDOWS_VERSION_OVERRIDE, "")
-    ? [WINDOWS_VERSION_OVERRIDE]
-  : is_jenkins_version_weekly() ? windows_version_to_build_for_weekly : windows_version_to_build_for_lts)
+  result = notequal(WINDOWS_VERSION_OVERRIDE, "") ? [WINDOWS_VERSION_OVERRIDE] : windows_version_to_build
 }

tests/golden/expected_tags_latest_lts.txt

@@ -1,56 +1,42 @@
-docker.io/jenkins/jenkins:2.541.1 (debian_jdk21)
-docker.io/jenkins/jenkins:2.541.1-alpine (alpine_jdk21)
-docker.io/jenkins/jenkins:2.541.1-alpine-jdk17 (alpine_jdk17)
-docker.io/jenkins/jenkins:2.541.1-alpine-jdk21 (alpine_jdk21)
-docker.io/jenkins/jenkins:2.541.1-alpine-jdk25 (alpine_jdk25)
-docker.io/jenkins/jenkins:2.541.1-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
-docker.io/jenkins/jenkins:2.541.1-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
-docker.io/jenkins/jenkins:2.541.1-jdk17 (debian_jdk17)
-docker.io/jenkins/jenkins:2.541.1-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
-docker.io/jenkins/jenkins:2.541.1-jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk17)
-docker.io/jenkins/jenkins:2.541.1-jdk21 (debian_jdk21)
-docker.io/jenkins/jenkins:2.541.1-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
-docker.io/jenkins/jenkins:2.541.1-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
-docker.io/jenkins/jenkins:2.541.1-jdk25 (debian_jdk25)
-docker.io/jenkins/jenkins:2.541.1-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
-docker.io/jenkins/jenkins:2.541.1-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
-docker.io/jenkins/jenkins:2.541.1-lts (debian_jdk21)
-docker.io/jenkins/jenkins:2.541.1-lts-alpine (alpine_jdk21)
-docker.io/jenkins/jenkins:2.541.1-lts-jdk17 (debian_jdk17)
-docker.io/jenkins/jenkins:2.541.1-lts-jdk21 (debian_jdk21)
-docker.io/jenkins/jenkins:2.541.1-lts-jdk25 (debian_jdk25)
-docker.io/jenkins/jenkins:2.541.1-lts-rhel-ubi9-jdk17 (rhel_jdk17)
-docker.io/jenkins/jenkins:2.541.1-lts-rhel-ubi9-jdk21 (rhel_jdk21)
-docker.io/jenkins/jenkins:2.541.1-lts-rhel-ubi9-jdk25 (rhel_jdk25)
-docker.io/jenkins/jenkins:2.541.1-lts-slim (debian-slim_jdk21)
-docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk17 (rhel_jdk17)
-docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk21 (rhel_jdk21)
-docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk25 (rhel_jdk25)
-docker.io/jenkins/jenkins:2.541.1-slim (debian-slim_jdk21)
-docker.io/jenkins/jenkins:2.541.1-slim-jdk17 (debian-slim_jdk17)
-docker.io/jenkins/jenkins:2.541.1-slim-jdk21 (debian-slim_jdk21)
-docker.io/jenkins/jenkins:2.541.1-slim-jdk25 (debian-slim_jdk25)
-docker.io/jenkins/jenkins:2.541.1-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
-docker.io/jenkins/jenkins:2.541.1-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
+docker.io/jenkins/jenkins:2.504.3 (debian_jdk21)
+docker.io/jenkins/jenkins:2.504.3-alpine (alpine_jdk21)
+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-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:2.504.3-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
+docker.io/jenkins/jenkins:2.504.3-jdk21 (debian_jdk21)
+docker.io/jenkins/jenkins:2.504.3-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:2.504.3-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
+docker.io/jenkins/jenkins:2.504.3-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:2.504.3-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
+docker.io/jenkins/jenkins:2.504.3-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
+docker.io/jenkins/jenkins:2.504.3-lts (debian_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-alpine (alpine_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-jdk21 (debian_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:2.504.3-lts-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-rhel-ubi9-jdk25 (rhel_jdk25)
+docker.io/jenkins/jenkins:2.504.3-lts-slim (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.504.3-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.504.3-rhel-ubi9-jdk25 (rhel_jdk25)
+docker.io/jenkins/jenkins:2.504.3-slim (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.504.3-slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.504.3-slim-jdk25 (debian-slim_jdk25)
+docker.io/jenkins/jenkins:2.504.3-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+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)