Remove systemd specific containers

saltstack · Dec 7, 2024 · 6a0c035 · 6a0c035
1 parent 0322d70
commit 6a0c035
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 499 deletions.
diff --git a/README.md b/README.md
@@ -110,14 +110,6 @@ will be commited.
 - testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
-- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
-- testing:systemd-amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2023`
-- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
-- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
-- testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
-- testing:systemd-rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8`
-- testing:systemd-rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9`
-- testing:systemd-ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04`
 - testing:ubuntu-20.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-20.04`
 - testing:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04`
 - testing:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-24.04`

diff --git a/containers.yml b/containers.yml
@@ -48,24 +48,16 @@ custom:
     versions:
       - ubuntu-20.04
       - ubuntu-22.04
-      - systemd-ubuntu-22.04
       - ubuntu-24.04
       - rockylinux-8
-      - systemd-rockylinux-8
       - rockylinux-9
-      - systemd-rockylinux-9
       - photon-4
       - photon-5
-      - systemd-photon-5
       - debian-11
-      - systemd-debian-11
       - debian-12
-      - systemd-debian-12
       - fedora-40
       - amazonlinux-2
-      - systemd-amazonlinux-2
       - amazonlinux-2023
-      - systemd-amazonlinux-2023
 
 # <---- Custom Containers ---------------------------------------------------------------------------------
 

diff --git a/custom/testing/README.md b/custom/testing/README.md
@@ -9,14 +9,6 @@
 - testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
-- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
-- testing:systemd-amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2023`
-- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
-- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
-- testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
-- testing:systemd-rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8`
-- testing:systemd-rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9`
-- testing:systemd-ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04`
 - testing:ubuntu-20.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-20.04`
 - testing:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04`
 - testing:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-24.04`
diff --git a/custom/testing/entrypoint.py b/custom/testing/entrypoint.py
diff --git a/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls b/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls
@@ -35,9 +35,11 @@ include:
   - pkgs.jq
   - pkgs.xz
   - pkgs.tree
-  - pkgs.cargo {#-
+  - pkgs.cargo
+  {#-
   - pkgs.awscli
-  - pkgs.amazon-cloudwatch-agent #}
+  - pkgs.amazon-cloudwatch-agent
+  - #}
   - pkgs.samba
 
   {#- OS Specific packages install #}

diff --git a/custom/testing/rescue.service b/custom/testing/rescue.service
diff --git a/custom/testing/systemd-amazonlinux-2.Dockerfile b/custom/testing/systemd-amazonlinux-2.Dockerfile
diff --git a/custom/testing/systemd-amazonlinux-2023.Dockerfile b/custom/testing/systemd-amazonlinux-2023.Dockerfile
diff --git a/custom/testing/systemd-debian-11.Dockerfile b/custom/testing/systemd-debian-11.Dockerfile
diff --git a/custom/testing/systemd-debian-12.Dockerfile b/custom/testing/systemd-debian-12.Dockerfile
diff --git a/custom/testing/systemd-photon-5.Dockerfile b/custom/testing/systemd-photon-5.Dockerfile
diff --git a/custom/testing/systemd-rockylinux-8.Dockerfile b/custom/testing/systemd-rockylinux-8.Dockerfile