From 90452fbddc75033c1d9ac013309bbe2463b5cb75 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Fri, 4 Sep 2026 13:01:21 -0600 Subject: [PATCH 1/2] ci: drop debian-11 (EOL), add debian-13 testing Debian 11 (bullseye) reached the end of its LTS window on 2026-08-31 (https://www.debian.org/releases/bullseye/). Its security suite is now frozen (Release file's own Date field is stuck at that exact moment) and packages are becoming unreliable to fetch - this has been repeatedly breaking salt-ci-containers' testing:debian-11 image build, in turn blocking publication of every other image in the same run (fail-fast: false doesn't help here since the downstream merge/publish job still needs every build job to succeed). Salt's own published support policy already excludes this case: 'Debian stable, oldstable, and oldoldstable (if it is not EOL) versions.' Debian 11 is oldoldstable and is now EOL, so it falls outside Salt's own supported list. Follows the same pattern as the debian-10 removal (69495e9): drop the CI job and bump __check_end_of_life_versions' Debian threshold from <11 to <12, matching the same hard-block convention already used for other EOL distros (e.g. ALT Linux's <10 check). debian-13 was already scaffolded in generate.py (its git-version blacklist entries were pre-populated, just commented out of the base distro lists) - move it from commented to active in LINUX_DISTROS/ STABLE_DISTROS/ONEDIR_DISTROS so Debian keeps CI coverage. Its existing blacklist entries correctly keep it out of git-3006/git-3007/ git-master while allowing git-3008, so no further changes were needed there. testing:debian-13's container image already builds successfully in salt-ci-containers, unlike debian-11. --- .github/workflows/ci.yml | 26 ++++++++++++------------- .github/workflows/templates/generate.py | 9 +++------ bootstrap-salt.sh | 5 +++-- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67a147a42..15140009d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,34 +240,34 @@ jobs: instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-24", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' - debian-11: - name: Debian 11 + debian-12: + name: Debian 12 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-linux.yml needs: - lint - generate-actions-workflow with: - distro-slug: debian-11 - display-name: Debian 11 - container-slug: debian-11 + distro-slug: debian-12 + display-name: Debian 12 + container-slug: debian-12 timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-24", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' + instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' - debian-12: - name: Debian 12 + debian-13: + name: Debian 13 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-linux.yml needs: - lint - generate-actions-workflow with: - distro-slug: debian-12 - display-name: Debian 12 - container-slug: debian-12 + distro-slug: debian-13 + display-name: Debian 13 + container-slug: debian-13 timeout: 20 - instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' + instances: '["stable-3006", "onedir-3006", "stable-3006-24", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "latest", "default"]' photon-5: @@ -361,8 +361,8 @@ jobs: - altlinux-11 - amazonlinux-2023 - archlinux - - debian-11 - debian-12 + - debian-13 - photon-5 - rockylinux-8 - rockylinux-9 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 8c0efa442..e1eec13cb 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -10,7 +10,6 @@ os.chdir(os.path.abspath(os.path.dirname(__file__))) # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -20,8 +19,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -40,7 +39,6 @@ ] # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -50,8 +48,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -60,7 +58,6 @@ ] # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -70,8 +67,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 70f0f0957..272fbdf78 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1618,8 +1618,9 @@ __debian_codename_translation() { __check_end_of_life_versions() { case "${DISTRO_NAME_L}" in debian) - # Debian versions below 11 are not supported - if [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + # Debian 11 (bullseye) reached end of LTS support on 2026-08-31. + # See: https://www.debian.org/releases/bullseye/ + if [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://wiki.debian.org/DebianReleases" From 84b93144e0d93008b1cd3c5f8d93e0c8925840c4 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Fri, 4 Sep 2026 13:19:34 -0600 Subject: [PATCH 2/2] ci: remove leftover debian-11 entries from generate.py debian-11 was already dropped from LINUX_DISTROS/STABLE_DISTROS/ ONEDIR_DISTROS, so these blacklist and display-name entries were dead weight with no effect on the generated workflow. Confirmed ci.yml is unchanged after regenerating. --- .github/workflows/templates/generate.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index e1eec13cb..4e10b9ee1 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -113,7 +113,6 @@ "altlinux-11", "amazonlinux-2", "amazonlinux-2023", - "debian-11", "debian-12", "debian-13", "fedora-40", @@ -129,7 +128,6 @@ BLACKLIST_GIT_3007 = [ "amazonlinux-2", "amazonlinux-2023", - "debian-11", "debian-13", "fedora-40", "photon-4", @@ -222,7 +220,6 @@ "amazonlinux-2": "Amazon 2", "amazonlinux-2023": "Amazon 2023", "archlinux": "Arch Linux", - "debian-11": "Debian 11", "debian-12": "Debian 12", "debian-13": "Debian 13", "fedora-40": "Fedora 40", @@ -246,7 +243,6 @@ "amazonlinux-2": "amazonlinux-2", "amazonlinux-2023": "amazonlinux-2023", "archlinux": "archlinux", - "debian-11": "debian-11", "debian-12": "debian-12", "debian-13": "debian-13", "fedora-40": "fedora-40",