From ac8db66ab9f82bbacdaa558ee8279c00ce65a238 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 19 Nov 2024 14:49:12 -0700
Subject: [PATCH] Clean up salt remnants

---
 custom/testing/amazonlinux-2.Dockerfile       |  4 ++++
 custom/testing/amazonlinux-2023.Dockerfile    | 20 +++++++++++--------
 custom/testing/debian-11.Dockerfile           |  4 ++++
 custom/testing/debian-12.Dockerfile           |  4 ++++
 custom/testing/fedora-40.Dockerfile           |  4 ++++
 custom/testing/photon-4.Dockerfile            |  4 ++++
 custom/testing/photon-5.Dockerfile            |  4 ++++
 custom/testing/rockylinux-8.Dockerfile        |  4 ++++
 custom/testing/rockylinux-9.Dockerfile        |  4 ++++
 custom/testing/systemd-photon-5.Dockerfile    |  4 ++++
 .../testing/systemd-rockylinux-8.Dockerfile   |  4 ++++
 .../testing/systemd-rockylinux-9.Dockerfile   |  4 ++++
 .../testing/systemd-ubuntu-22.04.Dockerfile   |  4 ++++
 custom/testing/ubuntu-20.04.Dockerfile        |  4 ++++
 custom/testing/ubuntu-22.04.Dockerfile        |  4 ++++
 custom/testing/ubuntu-24.04.Dockerfile        |  4 ++++
 16 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/custom/testing/amazonlinux-2.Dockerfile b/custom/testing/amazonlinux-2.Dockerfile
index e164ba9..b5e108b 100644
--- a/custom/testing/amazonlinux-2.Dockerfile
+++ b/custom/testing/amazonlinux-2.Dockerfile
@@ -26,6 +26,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
index 18dd6bd..cfbc63e 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,16 @@ 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-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
+  ./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
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/debian-11.Dockerfile b/custom/testing/debian-11.Dockerfile
index 588ea15..5a59d47 100644
--- a/custom/testing/debian-11.Dockerfile
+++ b/custom/testing/debian-11.Dockerfile
@@ -31,6 +31,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/debian-12.Dockerfile b/custom/testing/debian-12.Dockerfile
index 8b8be2b..0e21db4 100644
--- a/custom/testing/debian-12.Dockerfile
+++ b/custom/testing/debian-12.Dockerfile
@@ -31,6 +31,10 @@ tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index 08bbd18..ac04f35 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -26,6 +26,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
index 9686dba..18f13df 100644
--- a/custom/testing/photon-4.Dockerfile
+++ b/custom/testing/photon-4.Dockerfile
@@ -26,6 +26,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/photon-5.Dockerfile b/custom/testing/photon-5.Dockerfile
index 456a6e6..9dfed70 100644
--- a/custom/testing/photon-5.Dockerfile
+++ b/custom/testing/photon-5.Dockerfile
@@ -26,6 +26,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
index 7126126..b35af98 100644
--- a/custom/testing/rockylinux-8.Dockerfile
+++ b/custom/testing/rockylinux-8.Dockerfile
@@ -27,6 +27,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/rockylinux-9.Dockerfile b/custom/testing/rockylinux-9.Dockerfile
index e9f4e4c..f10b6ca 100644
--- a/custom/testing/rockylinux-9.Dockerfile
+++ b/custom/testing/rockylinux-9.Dockerfile
@@ -25,6 +25,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/systemd-photon-5.Dockerfile b/custom/testing/systemd-photon-5.Dockerfile
index 931ca4d..8179f7b 100644
--- a/custom/testing/systemd-photon-5.Dockerfile
+++ b/custom/testing/systemd-photon-5.Dockerfile
@@ -27,6 +27,10 @@ RUN <<EOF
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
 
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
+
   mv /usr/bin/tail /usr/bin/tail.real
 EOF
 
diff --git a/custom/testing/systemd-rockylinux-8.Dockerfile b/custom/testing/systemd-rockylinux-8.Dockerfile
index 80c6bf9..d8d82af 100644
--- a/custom/testing/systemd-rockylinux-8.Dockerfile
+++ b/custom/testing/systemd-rockylinux-8.Dockerfile
@@ -28,6 +28,10 @@ RUN <<EOF
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
 
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
+
   mv /usr/bin/tail /usr/bin/tail.real
 EOF
 
diff --git a/custom/testing/systemd-rockylinux-9.Dockerfile b/custom/testing/systemd-rockylinux-9.Dockerfile
index 457f141..73e313b 100644
--- a/custom/testing/systemd-rockylinux-9.Dockerfile
+++ b/custom/testing/systemd-rockylinux-9.Dockerfile
@@ -28,6 +28,10 @@ RUN <<EOF
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
 
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
+
   mv /usr/bin/tail /usr/bin/tail.real
 EOF
 
diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index 4640bd0..fa104a2 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -32,6 +32,10 @@ RUN <<EOF
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
 
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
+
   mv /usr/bin/tail /usr/bin/tail.real
 EOF
 
diff --git a/custom/testing/ubuntu-20.04.Dockerfile b/custom/testing/ubuntu-20.04.Dockerfile
index 43ef064..d4794db 100644
--- a/custom/testing/ubuntu-20.04.Dockerfile
+++ b/custom/testing/ubuntu-20.04.Dockerfile
@@ -32,6 +32,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/ubuntu-22.04.Dockerfile b/custom/testing/ubuntu-22.04.Dockerfile
index f5685ba..7b18891 100644
--- a/custom/testing/ubuntu-22.04.Dockerfile
+++ b/custom/testing/ubuntu-22.04.Dockerfile
@@ -34,6 +34,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/ubuntu-24.04.Dockerfile b/custom/testing/ubuntu-24.04.Dockerfile
index 9963c7e..9d90b0a 100644
--- a/custom/testing/ubuntu-24.04.Dockerfile
+++ b/custom/testing/ubuntu-24.04.Dockerfile
@@ -31,6 +31,10 @@ RUN <<EOF
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
+
+  rm -rf /var/log/salt
+  rm -rf /var/cache/salt
+  rm -rf /etc/salt
 EOF
 
 CMD ["/bin/bash"]