Skip to content

chore(testing): drop debian-11 testing container #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
twangboy wants to merge 3 commits into from
Closed

chore(testing): drop debian-11 testing container #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a96ea
chore(testing): drop debian-11 testing container
twangboy Sep 4, 2026
2b4c3f7
fix(testing): restore docker coverage on Debian 12/13
twangboy Sep 4, 2026
6effdfe
fix(testing): re-enable vault on Debian 13 (trixie)
twangboy Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ will be commited.
- testing:altlinux-11 - `ghcr.io/saltstack/salt-ci-containers/testing:altlinux-11`
- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
- testing:debian-13 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-13`
- testing:fedora-42 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-42`
Expand Down
1 change: 0 additions & 1 deletion containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ custom:
- rockylinux-10
- photon-4
- photon-5
- debian-11
- debian-12
- debian-13
- fedora-42
Expand Down
1 change: 0 additions & 1 deletion custom/testing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
- testing:altlinux-11 - `ghcr.io/saltstack/salt-ci-containers/testing:altlinux-11`
- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
- testing:debian-13 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-13`
- testing:fedora-42 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-42`
Expand Down
70 changes: 0 additions & 70 deletions custom/testing/debian-11.Dockerfile
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions custom/testing/golden-state-tree/os/debian/pkgs/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ include:
{%- elif grains['osrelease'] != '13' %}
- pkgs.dnsutils
{%- endif %}
{%- if grains['osrelease'] == '11' %}
- pkgs.docker
{%- endif %}
- pkgs.file
- pkgs.gcc
- pkgs.gpg
Expand Down Expand Up @@ -40,8 +38,7 @@ include:
- pkgs.swig
- pkgs.tar
- pkgs.zlib
{#- HashiCorp no longer publishes a Release file for bullseye (11), same as trixie (13) #}
{%- if grains['osrelease'] not in ('11', '13') and grains['osarch'] != 'arm64' %}
{%- if grains['osarch'] != 'arm64' %}
- pkgs.vault
{%- endif %}
- pkgs.jq
Expand Down
3 changes: 2 additions & 1 deletion custom/testing/golden-state-tree/pkgs/docker.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
{%- endif %}

{%- if grains['os'] == 'Debian' %}
{% set pkgver = '=5:28.4.0-1~debian.11~bullseye' %}
{%- set debian_codenames = {'11': 'bullseye', '12': 'bookworm', '13': 'trixie'} %}
{% set pkgver = '=5:28.4.0-1~debian.' + grains['osrelease'] + '~' + debian_codenames[grains['osrelease']] %}
{%- else %}
{% set pkgver = '' %}
{%- endif %}
Expand Down
Loading