From 2f22a28a1017be6c945793d1a49cbb38c06f1fb6 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 19 Nov 2024 14:34:28 -0700
Subject: [PATCH 1/4] Add more systemd containers

---
 .../testing/systemd-amazonlinux-2.Dockerfile  | 39 ++++++++++++++++
 .../systemd-amazonlinux-2023.Dockerfile       | 39 ++++++++++++++++
 custom/testing/systemd-debian-11.Dockerfile   | 45 +++++++++++++++++++
 custom/testing/systemd-debian-12.Dockerfile   | 45 +++++++++++++++++++
 .../testing/systemd-rockylinux-8.Dockerfile   |  2 +-
 5 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 custom/testing/systemd-amazonlinux-2.Dockerfile
 create mode 100644 custom/testing/systemd-amazonlinux-2023.Dockerfile
 create mode 100644 custom/testing/systemd-debian-11.Dockerfile
 create mode 100644 custom/testing/systemd-debian-12.Dockerfile

diff --git a/custom/testing/systemd-amazonlinux-2.Dockerfile b/custom/testing/systemd-amazonlinux-2.Dockerfile
new file mode 100644
index 0000000..1c08b64
--- /dev/null
+++ b/custom/testing/systemd-amazonlinux-2.Dockerfile
@@ -0,0 +1,39 @@
+FROM amazonlinux:2
+
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  yum update -y
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD ["/bin/bash"]
diff --git a/custom/testing/systemd-amazonlinux-2023.Dockerfile b/custom/testing/systemd-amazonlinux-2023.Dockerfile
new file mode 100644
index 0000000..72c31ca
--- /dev/null
+++ b/custom/testing/systemd-amazonlinux-2023.Dockerfile
@@ -0,0 +1,39 @@
+FROM amazonlinux:2023
+
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  yum update -y
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD ["/bin/bash"]
diff --git a/custom/testing/systemd-debian-11.Dockerfile b/custom/testing/systemd-debian-11.Dockerfile
new file mode 100644
index 0000000..0340196
--- /dev/null
+++ b/custom/testing/systemd-debian-11.Dockerfile
@@ -0,0 +1,45 @@
+FROM debian:11
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+  echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+
+  export DEBIAN_FRONTEND="noninteractive"
+
+  apt update -y
+  apt install -y tar wget xz-utils vim-nox apt-utils
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD [ "/bin/bash" ]
diff --git a/custom/testing/systemd-debian-12.Dockerfile b/custom/testing/systemd-debian-12.Dockerfile
new file mode 100644
index 0000000..9d65b23
--- /dev/null
+++ b/custom/testing/systemd-debian-12.Dockerfile
@@ -0,0 +1,45 @@
+FROM debian:12
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+  echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+
+  export DEBIAN_FRONTEND="noninteractive"
+
+  apt update -y
+  apt install -y tar wget xz-utils vim-nox apt-utils
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD [ "/bin/bash" ]
diff --git a/custom/testing/systemd-rockylinux-8.Dockerfile b/custom/testing/systemd-rockylinux-8.Dockerfile
index d8d82af..19c7431 100644
--- a/custom/testing/systemd-rockylinux-8.Dockerfile
+++ b/custom/testing/systemd-rockylinux-8.Dockerfile
@@ -16,7 +16,7 @@ RUN <<EOF
 
   yum update -y
   yum install -y epel-release
-  yum install -y wget tar xz patchelf systemd
+  yum install -y wget tar xz patchelf systemd tree
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz

From af0ad060586090e6cf8040514caf87102cd7ef14 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 19 Nov 2024 14:59:53 -0700
Subject: [PATCH 2/4] Ensure systemd is installed

---
 custom/testing/systemd-amazonlinux-2.Dockerfile    | 2 +-
 custom/testing/systemd-amazonlinux-2023.Dockerfile | 2 +-
 custom/testing/systemd-debian-11.Dockerfile        | 2 +-
 custom/testing/systemd-debian-12.Dockerfile        | 2 +-
 custom/testing/systemd-photon-5.Dockerfile         | 2 +-
 custom/testing/systemd-ubuntu-22.04.Dockerfile     | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/custom/testing/systemd-amazonlinux-2.Dockerfile b/custom/testing/systemd-amazonlinux-2.Dockerfile
index 1c08b64..13e18e6 100644
--- a/custom/testing/systemd-amazonlinux-2.Dockerfile
+++ b/custom/testing/systemd-amazonlinux-2.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   yum update -y
-  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11 systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/systemd-amazonlinux-2023.Dockerfile b/custom/testing/systemd-amazonlinux-2023.Dockerfile
index 72c31ca..2376f84 100644
--- a/custom/testing/systemd-amazonlinux-2023.Dockerfile
+++ b/custom/testing/systemd-amazonlinux-2023.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   yum update -y
-  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11 systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/systemd-debian-11.Dockerfile b/custom/testing/systemd-debian-11.Dockerfile
index 0340196..37c9285 100644
--- a/custom/testing/systemd-debian-11.Dockerfile
+++ b/custom/testing/systemd-debian-11.Dockerfile
@@ -21,7 +21,7 @@ RUN <<EOF
   export DEBIAN_FRONTEND="noninteractive"
 
   apt update -y
-  apt install -y tar wget xz-utils vim-nox apt-utils
+  apt install -y tar wget xz-utils vim-nox apt-utils systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/systemd-debian-12.Dockerfile b/custom/testing/systemd-debian-12.Dockerfile
index 9d65b23..b318475 100644
--- a/custom/testing/systemd-debian-12.Dockerfile
+++ b/custom/testing/systemd-debian-12.Dockerfile
@@ -21,7 +21,7 @@ RUN <<EOF
   export DEBIAN_FRONTEND="noninteractive"
 
   apt update -y
-  apt install -y tar wget xz-utils vim-nox apt-utils
+  apt install -y tar wget xz-utils vim-nox apt-utils systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/systemd-photon-5.Dockerfile b/custom/testing/systemd-photon-5.Dockerfile
index 247c425..9f71759 100644
--- a/custom/testing/systemd-photon-5.Dockerfile
+++ b/custom/testing/systemd-photon-5.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   tdnf update -y
-  tdnf install -y curl wget tar xz systemd # patchelf
+  tdnf install -y curl wget tar tree xz systemd # patchelf
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index fa104a2..450b546 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -18,9 +18,9 @@ RUN <<EOF
   apt update -y
   echo 'tzdata tzdata/Areas select America' | debconf-set-selections
   echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-  DEBIAN_FRONTEND="noninteractive" apt install -y coreutils tree tar \
-    wget xz-utils apt-utils systemd python3 python3-pip python3-venv git
-
+  export DEBIAN_FRONTEND="noninteractive"
+  apt install -y coreutils tree tar wget xz-utils apt-utils systemd python3 \
+    python3-pip python3-venv git systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz

From a650f5aa4414173c7e85037aee8b7c4f78a31622 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 19 Nov 2024 16:29:40 -0700
Subject: [PATCH 3/4] Update containers

---
 README.md                | 5 ++++-
 containers.yml           | 4 ++++
 custom/testing/README.md | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0334971..a11c09e 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,6 @@ will be commited.
 ### [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
 - 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:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
@@ -110,6 +109,10 @@ 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`
diff --git a/containers.yml b/containers.yml
index 11575d9..401e68c 100644
--- a/containers.yml
+++ b/containers.yml
@@ -58,10 +58,14 @@ custom:
       - 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 ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>
diff --git a/custom/testing/README.md b/custom/testing/README.md
index e049e39..a48ac8f 100644
--- a/custom/testing/README.md
+++ b/custom/testing/README.md
@@ -1,7 +1,6 @@
 # [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
 - 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:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
@@ -9,6 +8,10 @@
 - 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`

From 49041373c86e2562094c71c0ec1565daad0311c2 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 20 Nov 2024 17:53:51 -0700
Subject: [PATCH 4/4] Do not build amazonlinux 2023 yet

---
 README.md                | 1 -
 containers.yml           | 2 +-
 custom/testing/README.md | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a11c09e..c6fc42c 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,6 @@ will be commited.
 - 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`
diff --git a/containers.yml b/containers.yml
index 401e68c..2ebb975 100644
--- a/containers.yml
+++ b/containers.yml
@@ -65,7 +65,7 @@ custom:
       - amazonlinux-2
       - systemd-amazonlinux-2
       # - amazonlinux-2023
-      - systemd-amazonlinux-2023
+      # - systemd-amazonlinux-2023
 # <---- Custom Containers ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>
diff --git a/custom/testing/README.md b/custom/testing/README.md
index a48ac8f..a9b09b4 100644
--- a/custom/testing/README.md
+++ b/custom/testing/README.md
@@ -9,7 +9,6 @@
 - 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`