From c0d850869a038f3aca1a61c3ce87eb46e956a161 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 12 Nov 2024 03:48:11 -0700
Subject: [PATCH 01/15] Catch errors while provisioning

---
 custom/testing/amazonlinux-2.Dockerfile       | 30 ++++++++++---
 custom/testing/amazonlinux-2023.Dockerfile    | 30 ++++++++++---
 custom/testing/debian-11.Dockerfile           | 43 +++++++++++-------
 custom/testing/debian-12.Dockerfile           | 37 +++++++++------
 custom/testing/debian-13.Dockerfile           | 43 ++++++++++--------
 custom/testing/fedora-40.Dockerfile           |  8 ++++
 .../golden-state-tree/os/rocky/init.sls       |  6 ---
 custom/testing/photon-4.Dockerfile            | 28 ++++++++++--
 custom/testing/photon-5.Dockerfile            | 28 ++++++++++--
 custom/testing/rockylinux-8.Dockerfile        |  3 ++
 .../testing/systemd-ubuntu-22.04.Dockerfile   |  5 ++-
 custom/testing/ubuntu-20.04.Dockerfile        | 44 +++++++++++-------
 custom/testing/ubuntu-22.04.Dockerfile        | 45 ++++++++++++-------
 custom/testing/ubuntu-24.04.Dockerfile        | 43 +++++++++++-------
 14 files changed, 269 insertions(+), 124 deletions(-)

diff --git a/custom/testing/amazonlinux-2.Dockerfile b/custom/testing/amazonlinux-2.Dockerfile
index ab3b73b..dd1fc27 100644
--- a/custom/testing/amazonlinux-2.Dockerfile
+++ b/custom/testing/amazonlinux-2.Dockerfile
@@ -1,7 +1,27 @@
 FROM amazonlinux:2
 
-RUN yum update -y \
-  && yum install -y python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
-    systemd-units git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
-    curl wget \
-    && yum install -y patchelf
+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 epel-release
+  yum install -y curl wget tar xz 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
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
index 6dd380c..981d662 100644
--- a/custom/testing/amazonlinux-2023.Dockerfile
+++ b/custom/testing/amazonlinux-2023.Dockerfile
@@ -1,7 +1,27 @@
 FROM amazonlinux:2023
 
-RUN yum update -y \
-  && yum install -y --allowerasing python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
-    systemd-units git gnupg2 jq createrepo rpm-sign rustc cargo \
-    curl wget \
-    && yum install -y patchelf
+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 epel-release
+  yum install -y curl wget tar xz 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
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/debian-11.Dockerfile b/custom/testing/debian-11.Dockerfile
index 28dad8f..588ea15 100644
--- a/custom/testing/debian-11.Dockerfile
+++ b/custom/testing/debian-11.Dockerfile
@@ -4,24 +4,33 @@ 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
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+  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 provision
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/debian-12.Dockerfile b/custom/testing/debian-12.Dockerfile
index 5ec6b3b..8b8be2b 100644
--- a/custom/testing/debian-12.Dockerfile
+++ b/custom/testing/debian-12.Dockerfile
@@ -4,24 +4,33 @@ 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
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-apt update -y
-apt install -y tar wget xz-utils vim-nox apt-utils
+  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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/debian-13.Dockerfile b/custom/testing/debian-13.Dockerfile
index 5414fb5..4974f40 100644
--- a/custom/testing/debian-13.Dockerfile
+++ b/custom/testing/debian-13.Dockerfile
@@ -1,28 +1,35 @@
 FROM debian:trixie
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
-
 COPY golden-pillar-tree golden-pillar-tree
 COPY golden-state-tree golden-state-tree
 
 RUN <<EOF
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+  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 provision
+
+ rm -rf /salt
+ rm -rf /salt-3007.1-onedir-linux-$ARCH.tar.xz
+ rm -rf /golden-pillar-tree
+ rm -rf /golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index 7c1bf0b..0135db1 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -3,18 +3,26 @@ FROM fedora:40
 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 epel-release
   yum install -y curl wget tar xz 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/golden-state-tree/os/rocky/init.sls b/custom/testing/golden-state-tree/os/rocky/init.sls
index f640915..5de00e6 100644
--- a/custom/testing/golden-state-tree/os/rocky/init.sls
+++ b/custom/testing/golden-state-tree/os/rocky/init.sls
@@ -3,9 +3,3 @@ include:
   - .pkgs
   - download.vault
   - python
-
-{#
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
-#}
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
index 20055bc..429f8cd 100644
--- a/custom/testing/photon-4.Dockerfile
+++ b/custom/testing/photon-4.Dockerfile
@@ -1,5 +1,27 @@
 FROM photon:4.0
 
-RUN yum update -y \
-  && yum install -y --allowerasing python3 python3-devel build-essential \
-  python3-pip openssl git git jq createrepo curl wget
+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 epel-release
+  yum install -y curl wget tar xz 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
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/photon-5.Dockerfile b/custom/testing/photon-5.Dockerfile
index 78e0803..476ab5a 100644
--- a/custom/testing/photon-5.Dockerfile
+++ b/custom/testing/photon-5.Dockerfile
@@ -1,5 +1,27 @@
 FROM photon:5.0
 
-RUN yum update -y \
-  && yum install -y --allowerasing python3 python3-devel python3-pip \
-    build-essential openssl git git jq createrepo curl wget
+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 epel-release
+  yum install -y curl wget tar xz 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
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
index ce0a4e4..6286a7b 100644
--- a/custom/testing/rockylinux-8.Dockerfile
+++ b/custom/testing/rockylinux-8.Dockerfile
@@ -3,7 +3,10 @@ FROM rockylinux:8
 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
diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index 83ad810..7ddb2da 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -1,9 +1,10 @@
 FROM ubuntu:22.04
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
-COPY entrypoint.py entrypoint.py
-
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
 
+SHELL ["/bin/bash", "-c"]
 
 # init and systemd are the only real requirements for systemd.
 #
diff --git a/custom/testing/ubuntu-20.04.Dockerfile b/custom/testing/ubuntu-20.04.Dockerfile
index 0beadae..43ef064 100644
--- a/custom/testing/ubuntu-20.04.Dockerfile
+++ b/custom/testing/ubuntu-20.04.Dockerfile
@@ -4,24 +4,34 @@ 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
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+  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 provision
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/ubuntu-22.04.Dockerfile b/custom/testing/ubuntu-22.04.Dockerfile
index 91e82b1..f5685ba 100644
--- a/custom/testing/ubuntu-22.04.Dockerfile
+++ b/custom/testing/ubuntu-22.04.Dockerfile
@@ -1,28 +1,39 @@
 FROM ubuntu:22.04
 
+ARG PROVISTION_SALT_VERSION 3007.1
 
 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
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+  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 provision
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/ubuntu-24.04.Dockerfile b/custom/testing/ubuntu-24.04.Dockerfile
index e30786e..9963c7e 100644
--- a/custom/testing/ubuntu-24.04.Dockerfile
+++ b/custom/testing/ubuntu-24.04.Dockerfile
@@ -4,24 +4,33 @@ 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
-echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-export DEBIAN_FRONTEND="noninteractive"
-if [ $(uname -m) = "x86_64" ]; then
-  export ARCH=x86_64
-else
-  export ARCH=arm64
-fi
-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 provision
-rm -rf salt
-rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-rm -rf golden-pillar-tree
-rm -rf golden-state-tree
+  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 provision
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]

From bcb15f48d9dd543e4bc10c5688e108afa422732d Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 12 Nov 2024 15:16:37 -0700
Subject: [PATCH 02/15] Fix some container builds

---
 custom/testing/fedora-40.Dockerfile                   |  1 -
 custom/testing/golden-state-tree/python-pkgs/init.sls |  2 ++
 custom/testing/photon-4.Dockerfile                    | 10 +++++++---
 custom/testing/photon-5.Dockerfile                    | 10 +++++++---
 custom/testing/systemd-ubuntu-22.04.Dockerfile        |  4 ++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index 0135db1..75c923a 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -15,7 +15,6 @@ RUN <<EOF
   fi
 
   yum update -y
-  yum install -y epel-release
   yum install -y curl wget tar xz patchelf
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/golden-state-tree/python-pkgs/init.sls b/custom/testing/golden-state-tree/python-pkgs/init.sls
index 30ff3ac..524f6c7 100644
--- a/custom/testing/golden-state-tree/python-pkgs/init.sls
+++ b/custom/testing/golden-state-tree/python-pkgs/init.sls
@@ -1,6 +1,8 @@
+{#-
 include:
   - .nox
   - .pyyaml
+#}
 
 provision-python-packages:
   test.show_notification:
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
index 429f8cd..d0ab2dd 100644
--- a/custom/testing/photon-4.Dockerfile
+++ b/custom/testing/photon-4.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+
+  tdnf update -y
+  tdnf install -y curl wget tar xz  # 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/photon-5.Dockerfile b/custom/testing/photon-5.Dockerfile
index 476ab5a..456a6e6 100644
--- a/custom/testing/photon-5.Dockerfile
+++ b/custom/testing/photon-5.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+
+  tdnf update -y
+  tdnf install -y curl wget tar xz  # 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index 7ddb2da..2edfe99 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -21,7 +21,6 @@ RUN apt update -y \
   && 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 \
-  && chmod +x entrypoint.py \
   && mv /usr/bin/tail /usr/bin/tail.real
 
 # Set the root password, this was done before single user mode worked.
@@ -42,8 +41,9 @@ COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
 # essentially doing the same thing as entrypoint.py. When pid is not 1 we just
 # run tail.
 COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
 
-RUN chmod +x /usr/bin/tail
+RUN chmod +x /usr/bin/tail /entrypoint.py
 
 ENTRYPOINT [ "/entrypoint.py" ]
 CMD [ "/bin/bash" ]

From e8240a03661aadd6bf2cdd96718e709e5efacb4a Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 12 Nov 2024 22:54:00 -0700
Subject: [PATCH 03/15] fix python build on photon

---
 .../os/photon/config/init.sls                 |  6 ++--
 .../golden-state-tree/os/photon/init.sls      |  4 +++
 .../golden-state-tree/os/photon/pkgs/init.sls |  9 ++++++
 ...pendencies.sls => debian_dependencies.sls} |  0
 .../testing/golden-state-tree/python/init.sls | 17 ++++++++++-
 .../python/photon_dependencies.sls            | 30 +++++++++++++++++++
 custom/testing/photon-4.Dockerfile            |  2 +-
 7 files changed, 64 insertions(+), 4 deletions(-)
 rename custom/testing/golden-state-tree/python/{ubuntu_dependencies.sls => debian_dependencies.sls} (100%)
 create mode 100644 custom/testing/golden-state-tree/python/photon_dependencies.sls

diff --git a/custom/testing/golden-state-tree/os/photon/config/init.sls b/custom/testing/golden-state-tree/os/photon/config/init.sls
index db80f79..54c96f1 100644
--- a/custom/testing/golden-state-tree/os/photon/config/init.sls
+++ b/custom/testing/golden-state-tree/os/photon/config/init.sls
@@ -1,9 +1,11 @@
 include:
-  - .ssh_config
   - config.path
   - config.ulimits
   - config.locale
+{#-
+  - .ssh_config
   - config.sssd
-  - config.timezone
   - config.dhclient
   - config.sshd_config
+  - config.timezone
+#}
diff --git a/custom/testing/golden-state-tree/os/photon/init.sls b/custom/testing/golden-state-tree/os/photon/init.sls
index 093dd88..5c8f9d8 100644
--- a/custom/testing/golden-state-tree/os/photon/init.sls
+++ b/custom/testing/golden-state-tree/os/photon/init.sls
@@ -1,6 +1,10 @@
+
+
+
 include:
   - .config
   - .pkgs
+  - python
 
   {%- if pillar.get('github_actions_runner', False) %}
   - github-actions-runner
diff --git a/custom/testing/golden-state-tree/os/photon/pkgs/init.sls b/custom/testing/golden-state-tree/os/photon/pkgs/init.sls
index 5a0a6f4..0aad77c 100644
--- a/custom/testing/golden-state-tree/os/photon/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/photon/pkgs/init.sls
@@ -1,5 +1,13 @@
+
+install_rpm:
+  cmd.run:
+    - name: tdnf install -y rpm
+    - if_missing: /usr/bin/rpm
+    - order: 0
+
 include:
   - pkgs.cron
+  {#-
   - pkgs.bower
   - pkgs.curl
   - pkgs.dmidecode
@@ -34,3 +42,4 @@ include:
   - pkgs.rust {#-
   - pkgs.awscli
   - pkgs.amazon-cloudwatch-agent #}
+  #}
diff --git a/custom/testing/golden-state-tree/python/ubuntu_dependencies.sls b/custom/testing/golden-state-tree/python/debian_dependencies.sls
similarity index 100%
rename from custom/testing/golden-state-tree/python/ubuntu_dependencies.sls
rename to custom/testing/golden-state-tree/python/debian_dependencies.sls
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
index b7141c2..975c066 100644
--- a/custom/testing/golden-state-tree/python/init.sls
+++ b/custom/testing/golden-state-tree/python/init.sls
@@ -6,7 +6,22 @@
 {%- endif %}
 
 include:
-  - ./{{ grains['os'].lower() }}_dependencies
+  {%- if grains['os'] == 'Rocky' %}
+  - .rocky_dependencies
+  {%- elif grains.get("oscodename") == 'Amazon Linux 2' %}
+  - .rocky_dependencies
+  {%- elif grains.get("osfinger") == 'Amazon Linux-2023' %}
+  - .rocky_dependencies
+  {%- elif grains['os'] == 'VMware Photon OS' %}
+  - .photon_dependencies
+  {%- elif grains['os'] == 'Debian' %}
+  - .debian_dependencies
+  {%- elif grains['os'] == 'Ubuntu' %}
+  - .debian_dependencies
+  {%- else %}
+  - .{{ grains['os'].lower() }}_dependencies
+  {% endif %}
+
 
 python_source_archive:
   file.managed:
diff --git a/custom/testing/golden-state-tree/python/photon_dependencies.sls b/custom/testing/golden-state-tree/python/photon_dependencies.sls
new file mode 100644
index 0000000..f0c1ccb
--- /dev/null
+++ b/custom/testing/golden-state-tree/python/photon_dependencies.sls
@@ -0,0 +1,30 @@
+{#-
+#}
+
+coreutils:
+   pkg.installed:
+    - name: coreutils-selinux
+
+python_dependencies:
+   pkg.latest:
+     - pkgs:
+       - gcc
+       - make
+       - findutils
+       - binutils
+       - build-essential
+       - pkg-config
+       - openssl-devel
+       - libffi-devel
+       - bzip2-devel
+       - zlib-devel
+       - readline-devel
+       - ncurses-devel
+       - gdbm-devel
+       - sqlite-devel
+       - xz-devel
+       - expat-devel
+       - util-linux-devel
+       - libnsl-devel
+     - require:
+       - coreutils
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
index d0ab2dd..9686dba 100644
--- a/custom/testing/photon-4.Dockerfile
+++ b/custom/testing/photon-4.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   tdnf update -y
-  tdnf install -y curl wget tar xz  # patchelf
+  tdnf install -y curl wget tar xz # 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

From 9a49344779df51d3db11eddea3f6a5b44c4edaca Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 13 Nov 2024 00:43:43 -0700
Subject: [PATCH 04/15] Fix up fedora and amazon linux

---
 custom/testing/amazonlinux-2.Dockerfile       |  8 +++--
 custom/testing/fedora-40.Dockerfile           |  2 +-
 .../os/amazon/config/init.sls                 |  5 +--
 .../os/fedora/config/init.sls                 |  6 ++--
 .../golden-state-tree/os/fedora/init.sls      |  1 +
 .../golden-state-tree/os/fedora/pkgs/init.sls |  2 +-
 .../python/amazon_dependencies.sls            | 34 +++++++++++++++++++
 .../python/fedora_dependencies.sls            | 17 ++++++++++
 .../testing/golden-state-tree/python/init.sls |  2 ++
 9 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 custom/testing/golden-state-tree/python/amazon_dependencies.sls
 create mode 100644 custom/testing/golden-state-tree/python/fedora_dependencies.sls

diff --git a/custom/testing/amazonlinux-2.Dockerfile b/custom/testing/amazonlinux-2.Dockerfile
index dd1fc27..e164ba9 100644
--- a/custom/testing/amazonlinux-2.Dockerfile
+++ b/custom/testing/amazonlinux-2.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+  yum install -y curl wget tar xz patchelf util-linux 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 provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index 75c923a..da8cae7 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   yum update -y
-  yum install -y curl wget tar xz patchelf
+  yum install -y curl wget tar xz patchelf openssl-pkcs11-sign-provider
 
   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/golden-state-tree/os/amazon/config/init.sls b/custom/testing/golden-state-tree/os/amazon/config/init.sls
index 3932925..1f9ad92 100644
--- a/custom/testing/golden-state-tree/os/amazon/config/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon/config/init.sls
@@ -2,7 +2,8 @@ include:
   - config.path
   - config.ulimits
   - config.locale
+{#-
   - config.sssd
-  - config.timezone
-  - config.dhclient
   - config.sshd_config
+  - config.timezone #}
+  - config.dhclient
diff --git a/custom/testing/golden-state-tree/os/fedora/config/init.sls b/custom/testing/golden-state-tree/os/fedora/config/init.sls
index 3932925..ce9fd97 100644
--- a/custom/testing/golden-state-tree/os/fedora/config/init.sls
+++ b/custom/testing/golden-state-tree/os/fedora/config/init.sls
@@ -2,7 +2,7 @@ include:
   - config.path
   - config.ulimits
   - config.locale
-  - config.sssd
-  - config.timezone
-  - config.dhclient
+{#- - config.sssd
   - config.sshd_config
+  - config.timezone #}
+  - config.dhclient
diff --git a/custom/testing/golden-state-tree/os/fedora/init.sls b/custom/testing/golden-state-tree/os/fedora/init.sls
index 093dd88..d0babbd 100644
--- a/custom/testing/golden-state-tree/os/fedora/init.sls
+++ b/custom/testing/golden-state-tree/os/fedora/init.sls
@@ -1,6 +1,7 @@
 include:
   - .config
   - .pkgs
+  - python
 
   {%- if pillar.get('github_actions_runner', False) %}
   - github-actions-runner
diff --git a/custom/testing/golden-state-tree/os/fedora/pkgs/init.sls b/custom/testing/golden-state-tree/os/fedora/pkgs/init.sls
index 24f888a..bd43a5a 100644
--- a/custom/testing/golden-state-tree/os/fedora/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/fedora/pkgs/init.sls
@@ -5,7 +5,7 @@ include:
   - pkgs.curl
   - pkgs.dmidecode
   - pkgs.dnsutils
-  - pkgs.docker
+{#-  - pkgs.docker #}
   - pkgs.gcc
   - pkgs.gpg
   - pkgs.ipset
diff --git a/custom/testing/golden-state-tree/python/amazon_dependencies.sls b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
new file mode 100644
index 0000000..5af7e7b
--- /dev/null
+++ b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
@@ -0,0 +1,34 @@
+# Install dnf config manager
+install_config_command:
+  cmd.run:
+    - name: dnf install -y 'dnf-command(config-manager)'
+
+
+# Use config manager to enable powertools repo. This is needed for libnsl2-devel
+enable_powertools_repo:
+  cmd.run:
+    - name: dnf config-manager --set-enabled powertools
+    - require:
+      - install_config_command
+
+
+python_dependencies:
+   pkg.latest:
+     - pkgs:
+       - gcc
+       - make
+       - findutils
+       - openssl
+       - openssl-devel
+       - libffi-devel
+       - bzip2-devel
+       - zlib-devel
+       - libuuid-devel
+       - readline-devel
+       - ncurses-devel
+       - gdbm-devel
+       - sqlite-devel
+       - xz-devel
+       - libnsl2-devel
+     - require:
+       - enable_powertools_repo
diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
new file mode 100644
index 0000000..0f90e31
--- /dev/null
+++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
@@ -0,0 +1,17 @@
+python_dependencies:
+   pkg.latest:
+     - pkgs:
+       - gcc
+       - make
+       - findutils
+       - openssl-devel
+       - libffi-devel
+       - bzip2-devel
+       - zlib-ng-compat-devel
+       - libuuid-devel
+       - readline-devel
+       - ncurses-devel
+       - gdbm-devel
+       - sqlite-devel
+       - xz-devel
+       - libnsl2-devel
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
index 975c066..d334a89 100644
--- a/custom/testing/golden-state-tree/python/init.sls
+++ b/custom/testing/golden-state-tree/python/init.sls
@@ -8,6 +8,8 @@
 include:
   {%- if grains['os'] == 'Rocky' %}
   - .rocky_dependencies
+  {%- elif grains['os'] == 'Fedora' %}
+  - .fedora_dependencies
   {%- elif grains.get("oscodename") == 'Amazon Linux 2' %}
   - .rocky_dependencies
   {%- elif grains.get("osfinger") == 'Amazon Linux-2023' %}

From b3b747054d52868744010bc46957211e51c2402b Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 13 Nov 2024 01:54:25 -0700
Subject: [PATCH 05/15] Install python to /usr/local

---
 custom/testing/amazonlinux-2023.Dockerfile    |  8 +++--
 custom/testing/debian-13.Dockerfile           | 35 -------------------
 .../golden-state-tree/os/amazon/init.sls      |  4 ---
 .../golden-state-tree/os/amazon2023/init.sls  |  5 +--
 .../os/amazon2023/pkgs/init.sls               |  4 +--
 .../os/debian/config/init.sls                 |  2 ++
 .../golden-state-tree/os/debian/init.sls      |  5 +--
 .../golden-state-tree/os/fedora/init.sls      |  4 ---
 .../golden-state-tree/os/photon/init.sls      |  7 ----
 .../os/rocky/config/init.sls                  |  2 ++
 .../golden-state-tree/os/rocky/pkgs/init.sls  |  2 +-
 .../python/amazon_dependencies.sls            | 17 ---------
 .../testing/golden-state-tree/python/init.sls |  4 +--
 custom/testing/rockylinux-8.Dockerfile        |  5 +++
 14 files changed, 22 insertions(+), 82 deletions(-)
 delete mode 100644 custom/testing/debian-13.Dockerfile

diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
index 981d662..855bdd7 100644
--- a/custom/testing/amazonlinux-2023.Dockerfile
+++ b/custom/testing/amazonlinux-2023.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+  yum install -y wget 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 provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/debian-13.Dockerfile b/custom/testing/debian-13.Dockerfile
deleted file mode 100644
index 4974f40..0000000
--- a/custom/testing/debian-13.Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM debian:trixie
-
-COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
-COPY golden-pillar-tree golden-pillar-tree
-COPY golden-state-tree golden-state-tree
-
-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 provision
-
- rm -rf /salt
- rm -rf /salt-3007.1-onedir-linux-$ARCH.tar.xz
- rm -rf /golden-pillar-tree
- rm -rf /golden-state-tree
-EOF
-
-CMD ["/bin/bash"]
diff --git a/custom/testing/golden-state-tree/os/amazon/init.sls b/custom/testing/golden-state-tree/os/amazon/init.sls
index 093dd88..63cafa7 100644
--- a/custom/testing/golden-state-tree/os/amazon/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon/init.sls
@@ -1,7 +1,3 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/amazon2023/init.sls b/custom/testing/golden-state-tree/os/amazon2023/init.sls
index 093dd88..08e768b 100644
--- a/custom/testing/golden-state-tree/os/amazon2023/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon2023/init.sls
@@ -1,7 +1,4 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
+  - python
diff --git a/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls b/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls
index d3d83d4..e873c46 100644
--- a/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls
@@ -7,7 +7,7 @@ include:
   - pkgs.gpg
   - pkgs.libcurl
   - pkgs.libffi
-  - pkgs.libsodium-compile
+{#-  - pkgs.libsodium-compile #}
   - pkgs.libxml
   - pkgs.libxslt
   - pkgs.make
@@ -37,5 +37,5 @@ include:
 
   {#- OS Specific packages install #}
   {%- if grains['osarch'] not in ('amd64', 'armhf', 'arm64') %}
-  - .docker
+{#-  - .docker #}
   {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/debian/config/init.sls b/custom/testing/golden-state-tree/os/debian/config/init.sls
index b450d99..1db7e70 100644
--- a/custom/testing/golden-state-tree/os/debian/config/init.sls
+++ b/custom/testing/golden-state-tree/os/debian/config/init.sls
@@ -4,6 +4,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
+  {#-
   - config.timezone
   - config.dhclient
   - config.sshd_config
+  #}
diff --git a/custom/testing/golden-state-tree/os/debian/init.sls b/custom/testing/golden-state-tree/os/debian/init.sls
index 093dd88..08e768b 100644
--- a/custom/testing/golden-state-tree/os/debian/init.sls
+++ b/custom/testing/golden-state-tree/os/debian/init.sls
@@ -1,7 +1,4 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
+  - python
diff --git a/custom/testing/golden-state-tree/os/fedora/init.sls b/custom/testing/golden-state-tree/os/fedora/init.sls
index d0babbd..08e768b 100644
--- a/custom/testing/golden-state-tree/os/fedora/init.sls
+++ b/custom/testing/golden-state-tree/os/fedora/init.sls
@@ -2,7 +2,3 @@ include:
   - .config
   - .pkgs
   - python
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/photon/init.sls b/custom/testing/golden-state-tree/os/photon/init.sls
index 5c8f9d8..08e768b 100644
--- a/custom/testing/golden-state-tree/os/photon/init.sls
+++ b/custom/testing/golden-state-tree/os/photon/init.sls
@@ -1,11 +1,4 @@
-
-
-
 include:
   - .config
   - .pkgs
   - python
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/rocky/config/init.sls b/custom/testing/golden-state-tree/os/rocky/config/init.sls
index 3932925..d007e43 100644
--- a/custom/testing/golden-state-tree/os/rocky/config/init.sls
+++ b/custom/testing/golden-state-tree/os/rocky/config/init.sls
@@ -3,6 +3,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
+{#-
   - config.timezone
   - config.dhclient
   - config.sshd_config
+#}
diff --git a/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls b/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls
index 858770f..ec748bf 100644
--- a/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls
@@ -4,7 +4,7 @@ include:
   - pkgs.curl
   - pkgs.dmidecode
   - pkgs.dnsutils
-  - pkgs.docker
+{#-  - pkgs.docker #}
   - pkgs.gcc
   - pkgs.gpg
   - pkgs.ipset
diff --git a/custom/testing/golden-state-tree/python/amazon_dependencies.sls b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
index 5af7e7b..dea48f6 100644
--- a/custom/testing/golden-state-tree/python/amazon_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
@@ -1,17 +1,3 @@
-# Install dnf config manager
-install_config_command:
-  cmd.run:
-    - name: dnf install -y 'dnf-command(config-manager)'
-
-
-# Use config manager to enable powertools repo. This is needed for libnsl2-devel
-enable_powertools_repo:
-  cmd.run:
-    - name: dnf config-manager --set-enabled powertools
-    - require:
-      - install_config_command
-
-
 python_dependencies:
    pkg.latest:
      - pkgs:
@@ -29,6 +15,3 @@ python_dependencies:
        - gdbm-devel
        - sqlite-devel
        - xz-devel
-       - libnsl2-devel
-     - require:
-       - enable_powertools_repo
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
index d334a89..fe86ac7 100644
--- a/custom/testing/golden-state-tree/python/init.sls
+++ b/custom/testing/golden-state-tree/python/init.sls
@@ -11,9 +11,9 @@ include:
   {%- elif grains['os'] == 'Fedora' %}
   - .fedora_dependencies
   {%- elif grains.get("oscodename") == 'Amazon Linux 2' %}
-  - .rocky_dependencies
+  - .amazon_dependencies
   {%- elif grains.get("osfinger") == 'Amazon Linux-2023' %}
-  - .rocky_dependencies
+  - .amazon_dependencies
   {%- elif grains['os'] == 'VMware Photon OS' %}
   - .photon_dependencies
   {%- elif grains['os'] == 'Debian' %}
diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
index 6286a7b..7126126 100644
--- a/custom/testing/rockylinux-8.Dockerfile
+++ b/custom/testing/rockylinux-8.Dockerfile
@@ -7,17 +7,22 @@ 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 epel-release
   yum install -y curl wget tar xz 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree

From 87baffefee42c28b4317f52d5add6415e11b3843 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 13 Nov 2024 02:05:03 -0700
Subject: [PATCH 06/15] Fix up  rocky 8 systemd

---
 custom/testing/systemd-rockylinux-8.Dockerfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/custom/testing/systemd-rockylinux-8.Dockerfile b/custom/testing/systemd-rockylinux-8.Dockerfile
index ce0a4e4..5e97fc0 100644
--- a/custom/testing/systemd-rockylinux-8.Dockerfile
+++ b/custom/testing/systemd-rockylinux-8.Dockerfile
@@ -3,22 +3,34 @@ FROM rockylinux:8
 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 epel-release
-  yum install -y curl wget tar xz patchelf
+  yum install -y curl wget tar xz patchelf 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
 EOF
 
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
 CMD ["/bin/bash"]

From a0e2ff76e5533f30ff409ce01965d289ddcd358b Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 13 Nov 2024 14:06:58 -0700
Subject: [PATCH 07/15] Add more systemd containers

---
 README.md                                     |  4 +-
 containers.yml                                |  4 +-
 custom/testing/README.md                      |  4 +-
 custom/testing/rockylinux-9.Dockerfile        |  6 +++
 custom/testing/systemd-photon-5.Dockerfile    | 39 +++++++++++++++
 .../testing/systemd-rockylinux-8.Dockerfile   |  8 ++-
 .../testing/systemd-rockylinux-9.Dockerfile   | 40 +++++++++++++++
 .../testing/systemd-ubuntu-22.04.Dockerfile   | 49 ++++++++++++-------
 8 files changed, 131 insertions(+), 23 deletions(-)
 create mode 100644 custom/testing/systemd-photon-5.Dockerfile
 create mode 100644 custom/testing/systemd-rockylinux-9.Dockerfile

diff --git a/README.md b/README.md
index b11e260..0334971 100644
--- a/README.md
+++ b/README.md
@@ -105,12 +105,14 @@ will be commited.
 - 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-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
 - testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
 - 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-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`
diff --git a/containers.yml b/containers.yml
index 3128563..9d80263 100644
--- a/containers.yml
+++ b/containers.yml
@@ -51,12 +51,14 @@ custom:
       - 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
       - debian-12
-      - debian-13
       - fedora-40
       - amazonlinux-2
       - amazonlinux-2023
diff --git a/custom/testing/README.md b/custom/testing/README.md
index ec6273c..e049e39 100644
--- a/custom/testing/README.md
+++ b/custom/testing/README.md
@@ -4,12 +4,14 @@
 - 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-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
 - testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
 - 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-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`
diff --git a/custom/testing/rockylinux-9.Dockerfile b/custom/testing/rockylinux-9.Dockerfile
index 9a0c32a..a09f052 100644
--- a/custom/testing/rockylinux-9.Dockerfile
+++ b/custom/testing/rockylinux-9.Dockerfile
@@ -4,17 +4,23 @@ COPY golden-pillar-tree golden-pillar-tree
 COPY golden-state-tree golden-state-tree
 
 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 epel-release
   yum install -y curl wget tar xz 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
diff --git a/custom/testing/systemd-photon-5.Dockerfile b/custom/testing/systemd-photon-5.Dockerfile
new file mode 100644
index 0000000..931ca4d
--- /dev/null
+++ b/custom/testing/systemd-photon-5.Dockerfile
@@ -0,0 +1,39 @@
+FROM photon:5.0
+
+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
+
+  tdnf update -y
+  tdnf install -y curl wget tar xz  # 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
+
+  ./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 5e97fc0..6248ab9 100644
--- a/custom/testing/systemd-rockylinux-8.Dockerfile
+++ b/custom/testing/systemd-rockylinux-8.Dockerfile
@@ -1,4 +1,4 @@
-FROM rockylinux:8
+FROM rockylinux:9
 
 COPY golden-pillar-tree golden-pillar-tree
 COPY golden-state-tree golden-state-tree
@@ -21,16 +21,20 @@ RUN <<EOF
   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 provision
+  ./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-9.Dockerfile b/custom/testing/systemd-rockylinux-9.Dockerfile
new file mode 100644
index 0000000..6248ab9
--- /dev/null
+++ b/custom/testing/systemd-rockylinux-9.Dockerfile
@@ -0,0 +1,40 @@
+FROM rockylinux:9
+
+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 epel-release
+  yum install -y curl wget tar xz patchelf 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
+
+  ./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-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index 2edfe99..bdf580c 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -6,23 +6,37 @@ COPY golden-state-tree golden-state-tree
 
 SHELL ["/bin/bash", "-c"]
 
-# init and systemd are the only real requirements for systemd.
-#
-# tar wget x-utils can be used to fetch and extract a salt onedir.
-#
-# apt-utils was required by golden states, this may/should be fixed in those
-# states.
-#
-# tree is used by workflows for debugging
-#
-# coreutils provides tail
-RUN 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 \
-  && mv /usr/bin/tail /usr/bin/tail.real
-
+RUN <<EOF
+  set -e
+  # init and systemd are the only real requirements for systemd.
+  #
+  # tar wget x-utils can be used to fetch and extract a salt onedir.
+  #
+  # apt-utils was required by golden states, this may/should be fixed in those
+  # states.
+  #
+  # tree is used by workflows for debugging
+  #
+  # coreutils provides tail
+  RUN 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
+
+
+  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
 # Set the root password, this was done before single user mode worked.
 # RUN echo "root\nroot" | passwd -q root
 
@@ -42,7 +56,6 @@ COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
 # run tail.
 COPY tail /usr/bin/tail
 COPY entrypoint.py /entrypoint.py
-
 RUN chmod +x /usr/bin/tail /entrypoint.py
 
 ENTRYPOINT [ "/entrypoint.py" ]

From 562d7759c35b9232d847c62cc5fde656a802316e Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 13 Nov 2024 17:01:11 -0700
Subject: [PATCH 08/15] Fix rocky depends and systemd builds

---
 .../python/rocky_dependencies.sls             | 22 +++++++++++++++++++
 custom/testing/rockylinux-9.Dockerfile        |  2 +-
 .../testing/systemd-rockylinux-8.Dockerfile   |  4 ++--
 .../testing/systemd-rockylinux-9.Dockerfile   |  2 +-
 .../testing/systemd-ubuntu-22.04.Dockerfile   | 20 ++++++++---------
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/custom/testing/golden-state-tree/python/rocky_dependencies.sls b/custom/testing/golden-state-tree/python/rocky_dependencies.sls
index 168f446..8be9062 100644
--- a/custom/testing/golden-state-tree/python/rocky_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/rocky_dependencies.sls
@@ -4,12 +4,21 @@ install_config_command:
     - name: dnf install -y 'dnf-command(config-manager)'
 
 
+{%- if grains['lsb_distrib_release'].startswith("9") %}
+# Use config manager to enable powertools repo. This is needed for libnsl2-devel
+enable_devel_repo:
+  cmd.run:
+    - name: dnf config-manager --set-enabled devel
+    - require:
+      - install_config_command
+{%- else %}
 # Use config manager to enable powertools repo. This is needed for libnsl2-devel
 enable_powertools_repo:
   cmd.run:
     - name: dnf config-manager --set-enabled powertools
     - require:
       - install_config_command
+{% endif %}
 
 
 python_dependencies:
@@ -30,4 +39,17 @@ python_dependencies:
        - xz-devel
        - libnsl2-devel
      - require:
+{%- if grains['lsb_distrib_release'].startswith("9") %}
+       - enable_devel_repo
+{%- else %}
        - enable_powertools_repo
+{% endif %}
+
+{%- if grains['lsb_distrib_release'].startswith("9") %}
+# Use config manager to enable powertools repo. This is needed for libnsl2-devel
+disable_devel_repo:
+  cmd.run:
+    - name: dnf config-manager --set-disabled devel
+    - require:
+      - python_dependencies
+{%- endif %}
diff --git a/custom/testing/rockylinux-9.Dockerfile b/custom/testing/rockylinux-9.Dockerfile
index a09f052..e9f4e4c 100644
--- a/custom/testing/rockylinux-9.Dockerfile
+++ b/custom/testing/rockylinux-9.Dockerfile
@@ -14,7 +14,7 @@ RUN <<EOF
 
   yum update -y
   yum install -y epel-release
-  yum install -y curl wget tar xz patchelf
+  yum install -y wget tar xz 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-rockylinux-8.Dockerfile b/custom/testing/systemd-rockylinux-8.Dockerfile
index 6248ab9..80c6bf9 100644
--- a/custom/testing/systemd-rockylinux-8.Dockerfile
+++ b/custom/testing/systemd-rockylinux-8.Dockerfile
@@ -1,4 +1,4 @@
-FROM rockylinux:9
+FROM rockylinux:8
 
 COPY golden-pillar-tree golden-pillar-tree
 COPY golden-state-tree golden-state-tree
@@ -16,7 +16,7 @@ RUN <<EOF
 
   yum update -y
   yum install -y epel-release
-  yum install -y curl wget tar xz patchelf systemd
+  yum install -y wget tar xz patchelf 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-rockylinux-9.Dockerfile b/custom/testing/systemd-rockylinux-9.Dockerfile
index 6248ab9..3e7b68f 100644
--- a/custom/testing/systemd-rockylinux-9.Dockerfile
+++ b/custom/testing/systemd-rockylinux-9.Dockerfile
@@ -16,7 +16,7 @@ RUN <<EOF
 
   yum update -y
   yum install -y epel-release
-  yum install -y curl wget tar xz patchelf systemd
+  yum install -y wget tar xz patchelf 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-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index bdf580c..4640bd0 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -8,17 +8,14 @@ SHELL ["/bin/bash", "-c"]
 
 RUN <<EOF
   set -e
-  # init and systemd are the only real requirements for systemd.
-  #
-  # tar wget x-utils can be used to fetch and extract a salt onedir.
-  #
-  # apt-utils was required by golden states, this may/should be fixed in those
-  # states.
-  #
-  # tree is used by workflows for debugging
-  #
-  # coreutils provides tail
-  RUN apt update -y
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  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 \
@@ -37,6 +34,7 @@ RUN <<EOF
 
   mv /usr/bin/tail /usr/bin/tail.real
 EOF
+
 # Set the root password, this was done before single user mode worked.
 # RUN echo "root\nroot" | passwd -q root
 

From 8d4cc57cfb9137178a622924c9802a659f425b14 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Fri, 15 Nov 2024 03:18:21 -0700
Subject: [PATCH 09/15] Fix photon 5 python build and amazon 2023 arm build

---
 custom/testing/amazonlinux-2023.Dockerfile       | 16 ++++++++--------
 custom/testing/entrypoint.py                     |  2 +-
 .../os/amazon2023/config/init.sls                |  4 +++-
 .../python/amazon_dependencies.sls               |  2 ++
 custom/testing/golden-state-tree/python/init.sls |  4 ++++
 .../python/photon_dependencies.sls               | 11 +++++++++++
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
index 855bdd7..18dd6bd 100644
--- a/custom/testing/amazonlinux-2023.Dockerfile
+++ b/custom/testing/amazonlinux-2023.Dockerfile
@@ -1,7 +1,7 @@
 FROM amazonlinux:2023
 
-COPY golden-pillar-tree golden-pillar-tree
-COPY golden-state-tree golden-state-tree
+#COPY golden-pillar-tree golden-pillar-tree
+#COPY golden-state-tree golden-state-tree
 
 SHELL ["/bin/bash", "-c"]
 
@@ -20,12 +20,12 @@ RUN <<EOF
   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 provision
-
-  rm -rf salt
-  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-  rm -rf golden-pillar-tree
-  rm -rf golden-state-tree
+#  ./salt/salt-call --log-level=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+#
+#  rm -rf salt
+#  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+#  rm -rf golden-pillar-tree
+#  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/entrypoint.py b/custom/testing/entrypoint.py
index 676c314..d20c40b 100644
--- a/custom/testing/entrypoint.py
+++ b/custom/testing/entrypoint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/bin/env /usr/local/bin/python3
 """
 Systemd entrypoint hack.
 
diff --git a/custom/testing/golden-state-tree/os/amazon2023/config/init.sls b/custom/testing/golden-state-tree/os/amazon2023/config/init.sls
index 3932925..95d20f5 100644
--- a/custom/testing/golden-state-tree/os/amazon2023/config/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon2023/config/init.sls
@@ -3,6 +3,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
-  - config.timezone
   - config.dhclient
+  {#-
+  - config.timezone
   - config.sshd_config
+  #}
diff --git a/custom/testing/golden-state-tree/python/amazon_dependencies.sls b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
index dea48f6..394861e 100644
--- a/custom/testing/golden-state-tree/python/amazon_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
@@ -4,6 +4,8 @@ python_dependencies:
        - gcc
        - make
        - findutils
+       - binutils
+       - autoconf
        - openssl
        - openssl-devel
        - libffi-devel
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
index fe86ac7..e1d4fbb 100644
--- a/custom/testing/golden-state-tree/python/init.sls
+++ b/custom/testing/golden-state-tree/python/init.sls
@@ -43,6 +43,10 @@ configure_python:
   cmd.run:
     - name: ./configure --enable-optimizations --prefix={{ python_prefix }}
     - cwd: /tmp/Python-{{ python_version }}
+  {%- if grains['os'] == 'VMware Photon OS' %}
+    - env:
+        ax_cv_c_float_words_bigendian: "no"
+  {%- endif %}
     - creates: /tmp/Python-{{ python_version }}/Makefile
     - require:
       - python_source
diff --git a/custom/testing/golden-state-tree/python/photon_dependencies.sls b/custom/testing/golden-state-tree/python/photon_dependencies.sls
index f0c1ccb..61d26d2 100644
--- a/custom/testing/golden-state-tree/python/photon_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/photon_dependencies.sls
@@ -1,9 +1,17 @@
 {#-
 #}
 
+install_rpm:
+  cmd.run:
+    - name: tdnf install -y rpm
+    - if_missing: /usr/bin/rpm
+    - order: 0
+
 coreutils:
    pkg.installed:
     - name: coreutils-selinux
+    - requires:
+      - install_rpm
 
 python_dependencies:
    pkg.latest:
@@ -26,5 +34,8 @@ python_dependencies:
        - expat-devel
        - util-linux-devel
        - libnsl-devel
+       - iana-etc
+       - tzdata
+       - curl-devel
      - require:
        - coreutils

From 9e31601ac9bc2fb7aea74778e477c2ad12cb6058 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Fri, 15 Nov 2024 03:36:35 -0700
Subject: [PATCH 10/15] fix conflicting id

---
 .../testing/golden-state-tree/python/photon_dependencies.sls  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom/testing/golden-state-tree/python/photon_dependencies.sls b/custom/testing/golden-state-tree/python/photon_dependencies.sls
index 61d26d2..8a5bcc7 100644
--- a/custom/testing/golden-state-tree/python/photon_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/photon_dependencies.sls
@@ -1,7 +1,7 @@
 {#-
 #}
 
-install_rpm:
+install_rpm_for_py:
   cmd.run:
     - name: tdnf install -y rpm
     - if_missing: /usr/bin/rpm
@@ -11,7 +11,7 @@ coreutils:
    pkg.installed:
     - name: coreutils-selinux
     - requires:
-      - install_rpm
+      - install_rpm_for_py
 
 python_dependencies:
    pkg.latest:

From 54a70963f075183e61a8925b498483e47b9809cb Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Fri, 15 Nov 2024 14:10:18 -0700
Subject: [PATCH 11/15] Update fedora python build dependencies

---
 custom/testing/golden-state-tree/python/fedora_dependencies.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
index 0f90e31..aa2df88 100644
--- a/custom/testing/golden-state-tree/python/fedora_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
@@ -4,6 +4,8 @@ python_dependencies:
        - gcc
        - make
        - findutils
+       - binutils
+       - autoconf
        - openssl-devel
        - libffi-devel
        - bzip2-devel

From d7fd07bb47c9296b3b5d607b313a990b4e685248 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sun, 17 Nov 2024 15:22:22 -0700
Subject: [PATCH 12/15] Attept to debug fedora arm build

---
 custom/testing/fedora-40.Dockerfile                           | 2 +-
 .../testing/golden-state-tree/python/fedora_dependencies.sls  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index da8cae7..2f1f2a7 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -20,7 +20,7 @@ RUN <<EOF
   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 provision
+  ./salt/salt-call --log-leve=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
 
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
index aa2df88..5ce3c98 100644
--- a/custom/testing/golden-state-tree/python/fedora_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
@@ -5,7 +5,10 @@ python_dependencies:
        - make
        - findutils
        - binutils
+       - coreutils
        - autoconf
+       - autoconf-archive
+       - pkg-config
        - openssl-devel
        - libffi-devel
        - bzip2-devel
@@ -17,3 +20,4 @@ python_dependencies:
        - sqlite-devel
        - xz-devel
        - libnsl2-devel
+       - expat-devel

From 81ddf5a85e0f61d1f70726af8875b2b26bcb3497 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sun, 17 Nov 2024 18:07:18 -0700
Subject: [PATCH 13/15] fix typo

---
 custom/testing/fedora-40.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index 2f1f2a7..08bbd18 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -20,7 +20,7 @@ RUN <<EOF
   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 --log-leve=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  ./salt/salt-call --log-level=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
 
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz

From 02937a2781a0b17b8739333ac9332fce1d64220d Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sun, 17 Nov 2024 18:17:01 -0700
Subject: [PATCH 14/15] Fix package name

---
 custom/testing/golden-state-tree/python/fedora_dependencies.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
index 5ce3c98..60727d0 100644
--- a/custom/testing/golden-state-tree/python/fedora_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
@@ -8,7 +8,7 @@ python_dependencies:
        - coreutils
        - autoconf
        - autoconf-archive
-       - pkg-config
+       - pkgconf
        - openssl-devel
        - libffi-devel
        - bzip2-devel

From 2ae1c5dc690e0e9795cbe2f90691a1d19a306948 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Mon, 18 Nov 2024 01:07:17 -0700
Subject: [PATCH 15/15] reduce fedora depends for build success

---
 custom/testing/golden-state-tree/os/fedora/init.sls             | 2 +-
 custom/testing/golden-state-tree/python/fedora_dependencies.sls | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/testing/golden-state-tree/os/fedora/init.sls b/custom/testing/golden-state-tree/os/fedora/init.sls
index 08e768b..788a212 100644
--- a/custom/testing/golden-state-tree/os/fedora/init.sls
+++ b/custom/testing/golden-state-tree/os/fedora/init.sls
@@ -1,4 +1,4 @@
 include:
   - .config
   - .pkgs
-  - python
+{#  - python  #}
diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
index 60727d0..8a23685 100644
--- a/custom/testing/golden-state-tree/python/fedora_dependencies.sls
+++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls
@@ -3,6 +3,7 @@ python_dependencies:
      - pkgs:
        - gcc
        - make
+       {#-
        - findutils
        - binutils
        - coreutils
@@ -21,3 +22,4 @@ python_dependencies:
        - xz-devel
        - libnsl2-devel
        - expat-devel
+       #}