diff --git a/Jenkinsfile b/Jenkinsfile index a8a464179b..b3bbc42e41 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ if (SIMULATE_LTS_BUILD) { 'PUBLISH=false', 'TAG_NAME=2.504.3', // TODO: replace by the first LTS based on 2.534+ when available - 'JENKINS_VERSION=2.504.3', - 'WAR_SHA=ea8883431b8b5ef6b68fe0e5817c93dc0a11def380054e7de3136486796efeb0', + 'JENKINS_VERSION=2.541.1', + 'WAR_SHA=8b12678aa6f9550b06825b006f9096186b17a7b857e9b68ad3f980d9f430fc94', // Filter out golden file based testing // To filter out all tests, set BATS_FLAGS="--filter-tags none" 'BATS_FLAGS=--filter-tags "\\!test-type:golden-file"' diff --git a/tests/bake.bats b/tests/bake.bats index d52e555c48..ad9f321a5e 100644 --- a/tests/bake.bats +++ b/tests/bake.bats @@ -6,7 +6,7 @@ load test_helpers SUT_DESCRIPTION="docker bake" -LTS_JENKINS_VERSION="2.504.3" +LTS_JENKINS_VERSION="2.541.1" @test "[${SUT_DESCRIPTION}: tags] Default tags unchanged" { assert_matches_golden expected_tags make --silent tags diff --git a/tests/golden/expected_tags_latest_lts.txt b/tests/golden/expected_tags_latest_lts.txt index 0dfce7d390..ae8e03f6c0 100644 --- a/tests/golden/expected_tags_latest_lts.txt +++ b/tests/golden/expected_tags_latest_lts.txt @@ -1,37 +1,37 @@ -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-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-ltsc2019 (windowsservercore-ltsc2019_jdk21) -docker.io/jenkins/jenkins:2.504.3-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.504.3-jdk17 (debian_jdk17) -docker.io/jenkins/jenkins:2.504.3-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17) -docker.io/jenkins/jenkins:2.504.3-jdk17-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk17) -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-jdk17 (debian_jdk17) -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-jdk17 (rhel_jdk17) -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-jdk17 (rhel_jdk17) -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-jdk17 (debian-slim_jdk17) -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: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:lts (debian_jdk21) docker.io/jenkins/jenkins:lts-alpine (alpine_jdk21) docker.io/jenkins/jenkins:lts-alpine-jdk17 (alpine_jdk17)