chore: allow to differenciate JDKs to build depending on Jenkins release line by lemeurherve · Pull Request #2178 · jenkinsci/docker

lemeurherve · 2026-01-07T15:27:51Z

This PR allows to differenciate JDKs to build depending on Jenkins release line, to allow publishing both Weekly and LTS from the same source code even when their JDK requirements diverge for a while during JDK depreciations in Jenkins Core.

~~It also removes JDK17 from the JDKs to build for the Weekly releases~~ as 2.545 now requires JDK21 while the incoming LTS 2.541.1 won't.
EDIT: in a follow-up PR, different concern, see #2178 (comment)

Refs:

Remove JDK17 from controller images #2187

Testing done

make build

make show

{
  "group": {
    "alpine": {
      "targets": [
        "alpine_jdk21",
        "alpine_jdk25"
      ]
    },
    "debian": {
      "targets": [
        "debian_jdk21",
        "debian_jdk25",
        "debian-slim_jdk21",
        "debian-slim_jdk25"
      ]
    },
    "default": {
      "targets": [
        "linux"
      ]
    },
    "linux": {
      "targets": [
        "alpine",
        "debian",
        "rhel"
      ]
    },
    "rhel": {
      "targets": [
        "rhel_jdk21",
        "rhel_jdk25"
      ]
    }
  },
  "target": {
    "alpine_jdk21": {
      "context": ".",
      "dockerfile": "alpine/hotspot/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.23.2",
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-alpine-jdk21",
        "docker.io/jenkins/jenkins:2.534-alpine"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "alpine_jdk25": {
      "context": ".",
      "dockerfile": "alpine/hotspot/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.23.2",
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-alpine-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian-slim_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "-slim",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-slim-jdk21",
        "docker.io/jenkins/jenkins:2.534-slim"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian-slim_jdk25": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "-slim",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-slim-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-jdk21",
        "docker.io/jenkins/jenkins:2.534"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian_jdk25": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "rhel_jdk21": {
      "context": ".",
      "dockerfile": "rhel/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "RHEL_RELEASE_LINE": "ubi9",
        "RHEL_TAG": "9.7-1767674301",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "rhel_jdk25": {
      "context": ".",
      "dockerfile": "rhel/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.534",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "RHEL_RELEASE_LINE": "ubi9",
        "RHEL_TAG": "9.7-1767674301",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war/2.534/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    }
  }
}

JENKINS_VERSION=2.541.1 make show

{
  "group": {
    "alpine": {
      "targets": [
        "alpine_jdk17",
        "alpine_jdk21",
        "alpine_jdk25"
      ]
    },
    "debian": {
      "targets": [
        "debian_jdk17",
        "debian_jdk21",
        "debian_jdk25",
        "debian-slim_jdk17",
        "debian-slim_jdk21",
        "debian-slim_jdk25"
      ]
    },
    "default": {
      "targets": [
        "linux"
      ]
    },
    "linux": {
      "targets": [
        "alpine",
        "debian",
        "rhel"
      ]
    },
    "rhel": {
      "targets": [
        "rhel_jdk17",
        "rhel_jdk21",
        "rhel_jdk25"
      ]
    }
  },
  "target": {
    "alpine_jdk17": {
      "context": ".",
      "dockerfile": "alpine/hotspot/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.23.2",
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "17.0.17_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-alpine-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "alpine_jdk21": {
      "context": ".",
      "dockerfile": "alpine/hotspot/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.23.2",
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-alpine-jdk21",
        "docker.io/jenkins/jenkins:2.541.1-alpine"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "alpine_jdk25": {
      "context": ".",
      "dockerfile": "alpine/hotspot/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.23.2",
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-alpine-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian-slim_jdk17": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "-slim",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "17.0.17_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-slim-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian-slim_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "-slim",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-slim-jdk21",
        "docker.io/jenkins/jenkins:2.541.1-slim"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian-slim_jdk25": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "-slim",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-slim-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian_jdk17": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "17.0.17_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-jdk17"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-jdk21",
        "docker.io/jenkins/jenkins:2.541.1"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "debian_jdk25": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "DEBIAN_RELEASE_LINE": "trixie",
        "DEBIAN_VARIANT": "",
        "DEBIAN_VERSION": "20251117",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "rhel_jdk17": {
      "context": ".",
      "dockerfile": "rhel/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "17.0.17_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "RHEL_RELEASE_LINE": "ubi9",
        "RHEL_TAG": "9.7-1767674301",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk17"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "rhel_jdk21": {
      "context": ".",
      "dockerfile": "rhel/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "21.0.9_10",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "RHEL_RELEASE_LINE": "ubi9",
        "RHEL_TAG": "9.7-1767674301",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    },
    "rhel_jdk25": {
      "context": ".",
      "dockerfile": "rhel/Dockerfile",
      "args": {
        "COMMIT_SHA": "c23ccd0d689b05f8110b0d857da9fd64046b8fb4",
        "JAVA_VERSION": "25.0.1_8",
        "JENKINS_VERSION": "2.541.1",
        "PLUGIN_CLI_VERSION": "2.13.2",
        "RHEL_RELEASE_LINE": "ubi9",
        "RHEL_TAG": "9.7-1767674301",
        "WAR_SHA": "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228",
        "WAR_URL": "https://get.jenkins.io/war-stable/2.541.1/jenkins.war"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.541.1-rhel-ubi9-jdk25"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ],
      "output": [
        {
          "type": "docker"
        }
      ]
    }
  }
}

Submitter checklist

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Ensure that the pull request title represents the desired changelog entry
Please describe what you did
Link to relevant issues in GitHub or Jira
Link to relevant pull requests, esp. upstream and downstream changes
Ensure you have provided tests that demonstrate the feature works or the issue is fixed

…on release line

docker-bake.hcl

lemeurherve · 2026-01-07T16:11:11Z

Jenkinsfile

@@ -117,16 +117,12 @@ stage('Build') {

        if (!infra.isTrusted()) {
            def images = [


Note: to be really strict, there should be a map for Weekly images, and another with LTS images to get a proper exhaustive simulated LTS build on ci.jenkins.io in all cases.

But since that diff (no simulated jdk17 LTS) would only occur when manually replaying a simulated build and while weekly and LTS don't have the same list of JDKs, I didn't bother.

This new comment could also be extracted in another PR if needed as not directly related to this feature.

timja

Brilliant we've wanted this for awhile, previously we've used a hacky LTS branch I think

lemeurherve · 2026-01-07T17:20:53Z

Just missing that part for Windows to also benefit from this mechanism, cf #2121 (comment)

The last remaining bit I'd like to add in this repo to be like the agents ones: jenkinsci/docker-ssh-agent#426

docker-bake.hcl

… follow-up)

This reverts commit c23ccd0.

This reverts commit cf09db9.

tests/golden/expected_tags_latest_lts.txt

This reverts commit fe77aa7, extracted to jenkinsci#2184

dduportal

LGTM, except maybe the title which should be a chore since you've split the JDK17 removal to another PR (e.g. in the current state - 046147d being the lats commit - this PR does not introduce any change in the image delivered on Tuesday / LTS release days to end users).

I've changed the labels (for release drafter) but I let you change the title before merging to avoid pondering with the squash merge feature.

…ase line (#2178)

lemeurherve · 2026-01-22T17:55:06Z

Cf #2212,

Weekly/LTS differenciation to be removed from master too

Since #2195 this differenciation mechanism isn't needed anymore:

docker/docker-bake.hcl

Lines 2 to 16 in 4bd9193

    
           variable "jdks_to_build_for_lts" { 
        
             default = [17, 21, 25] 
        
           } 
        
           variable "jdks_to_build_for_weekly" { 
        
             default = [21, 25] 
        
           } 
        
           variable "windows_version_to_build_for_lts" { 
        
             default = ["windowsservercore-ltsc2019", "windowsservercore-ltsc2022"] 
        
           } 
        
           variable "windows_version_to_build_for_weekly" { 
        
             default = ["windowsservercore-ltsc2019", "windowsservercore-ltsc2022"] 
        
           }

To be replaced like in stable-2.541 branch:

docker/docker-bake.hcl

Lines 2 to 8 in 1122ed9

    
           variable "jdks_to_build" { 
        
             default = [17, 21, 25] 
        
           } 
        
           variable "windows_version_to_build" { 
        
             default = ["windowsservercore-ltsc2019", "windowsservercore-ltsc2022"] 
        
           }

lemeurherve added 2 commits January 7, 2026 16:27

feat: allow to differenciate JDKs to build depending on Jenkins versi…

2aa3696

…on release line

update golden files

cf09db9

lemeurherve changed the title ~~feat: allow to differenciate JDKs to build depending on Jenkins version release line~~ fix: allow to differenciate JDKs to build depending on Jenkins version release line Jan 7, 2026

lemeurherve added bug jdk17 labels Jan 7, 2026

remove jdk17 from ci.jenkins.io builds (Weekly)

c23ccd0

lemeurherve commented Jan 7, 2026

View reviewed changes

docker-bake.hcl Outdated Show resolved Hide resolved

lemeurherve marked this pull request as ready for review January 7, 2026 16:01

lemeurherve requested a review from a team as a code owner January 7, 2026 16:01

lemeurherve commented Jan 7, 2026

View reviewed changes

timja approved these changes Jan 7, 2026

View reviewed changes

lemeurherve and others added 2 commits January 7, 2026 18:27

Add helper comment for the list of images in Jenkinsfile

8db0b9f

s/<line>_jdks_to_build/jdks_to_build_for_<line>/

171aaeb

lemeurherve added the linux label Jan 7, 2026

lemeurherve changed the title ~~fix: allow to differenciate JDKs to build depending on Jenkins version release line~~ feat: allow to differenciate JDKs to build depending on Jenkins release line Jan 7, 2026

lemeurherve added enhancement and removed bug labels Jan 7, 2026

lemeurherve commented Jan 7, 2026

View reviewed changes

docker-bake.hcl Outdated Show resolved Hide resolved

lemeurherve marked this pull request as draft January 7, 2026 17:41

lemeurherve added 3 commits January 7, 2026 18:43

keep all JDKs in jdks_to_build_for_weekly in this PR (to be done as…

1c70f94

… follow-up)

Revert "remove jdk17 from ci.jenkins.io builds (Weekly)"

8ebbf24

This reverts commit c23ccd0.

Revert "update golden files"

53d2ac8

This reverts commit cf09db9.

lemeurherve added bake linux and removed linux jdk17 labels Jan 7, 2026

lemeurherve marked this pull request as ready for review January 7, 2026 17:55

lemeurherve mentioned this pull request Jan 7, 2026

feat: remove JDK17 from Weekly releases #2179

Merged

6 tasks

use a LTS JENKINS_VERSION for expected_tags_latest_lts

fe77aa7

timja approved these changes Jan 7, 2026

View reviewed changes

lemeurherve mentioned this pull request Jan 7, 2026

Remove linux-arm64, linux-s390x and linux-pcc64le groups from docker bake file #2180

Closed

lemeurherve commented Jan 7, 2026

View reviewed changes

tests/golden/expected_tags_latest_lts.txt Show resolved Hide resolved

lemeurherve mentioned this pull request Jan 7, 2026

Jenkins 2.545 AlmaLinux package forces Java 17 dependency, breaks startup requiring Java 21 jenkinsci/packaging#729

Closed

s/JENKINS_LTS_VERSION/LTS_JENKINS_VERSION

a4c0d57

timja approved these changes Jan 7, 2026

View reviewed changes

lemeurherve and others added 3 commits January 7, 2026 23:09

add sort like in the test of jenkinsci#2183

40b7245

comment on 2 lines

3757d18

Merge branch 'master' into docker-2.545-no-jdk17

0352193

lemeurherve mentioned this pull request Jan 7, 2026

chore(updatecli): keep simulated LTS JENKINS_VERSION and WAR_SHA up to date #2172

Merged

6 tasks

lemeurherve added 2 commits January 7, 2026 23:58

Revert "use a LTS JENKINS_VERSION for expected_tags_latest_lts"

46f8b62

This reverts commit fe77aa7, extracted to jenkinsci#2184

comment wording

046147d

lemeurherve mentioned this pull request Jan 7, 2026

chore(tests): use a LTS JENKINS_VERSION for expected_tags_latest_lts #2184

Merged

6 tasks

dduportal approved these changes Jan 8, 2026

View reviewed changes

dduportal added chore and removed enhancement labels Jan 8, 2026

lemeurherve changed the title ~~feat: allow to differenciate JDKs to build depending on Jenkins release line~~ chore: allow to differenciate JDKs to build depending on Jenkins release line Jan 8, 2026

lemeurherve merged commit 9b6c263 into jenkinsci:master Jan 8, 2026
16 checks passed

lemeurherve deleted the docker-2.545-no-jdk17 branch January 8, 2026 10:33

lemeurherve mentioned this pull request Jan 8, 2026

chore(tests): rename LTS_JENKINS_VERSION in bake tests #2186

Merged

6 tasks

Pnkcaht mentioned this pull request Jan 9, 2026

docker-bake: drop JDK 17 from weekly and future LTS controller images #2191

Closed

6 tasks

lemeurherve mentioned this pull request Jan 14, 2026

chore(windows): use docker bake to generate the docker compose file #2189

Merged

6 tasks

lemeurherve added into-lts This should be filed against an LTS branch and removed into-lts This should be filed against an LTS branch labels Jan 14, 2026

lemeurherve added a commit that referenced this pull request Jan 19, 2026

chore: allow to differenciate JDKs to build depending on Jenkins rele…

7fc211f

…ase line (#2178)

lemeurherve added a commit that referenced this pull request Jan 19, 2026

chore: allow to differenciate JDKs to build depending on Jenkins rele…

dcaed97

…ase line (#2178)

lemeurherve added a commit that referenced this pull request Jan 19, 2026

chore: allow to differenciate JDKs to build depending on Jenkins rele…

2e1ca70

…ase line (#2178)

lemeurherve mentioned this pull request Jan 23, 2026

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

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: allow to differenciate JDKs to build depending on Jenkins release line#2178

chore: allow to differenciate JDKs to build depending on Jenkins release line#2178
lemeurherve merged 15 commits intojenkinsci:masterfrom
lemeurherve:docker-2.545-no-jdk17

lemeurherve commented Jan 7, 2026 •

edited

Loading

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

lemeurherve Jan 7, 2026 •

edited

Loading

Uh oh!

lemeurherve Jan 7, 2026 •

edited

Loading

Uh oh!

timja left a comment

Uh oh!

lemeurherve commented Jan 7, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

dduportal left a comment •

edited

Loading

Uh oh!

Uh oh!

lemeurherve commented Jan 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -117,16 +117,12 @@ stage('Build') {

		if (!infra.isTrusted()) {
		def images = [

Uh oh!

Conversation

lemeurherve commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing done

Submitter checklist

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

lemeurherve Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lemeurherve Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timja left a comment

Choose a reason for hiding this comment

Uh oh!

lemeurherve commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dduportal left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lemeurherve commented Jan 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

lemeurherve commented Jan 7, 2026 •

edited

Loading

lemeurherve Jan 7, 2026 •

edited

Loading

lemeurherve Jan 7, 2026 •

edited

Loading

lemeurherve commented Jan 7, 2026 •

edited

Loading

dduportal left a comment •

edited

Loading