From 9cec9431e87f0adcccca0ac50a8eac696f0fe03f Mon Sep 17 00:00:00 2001
From: Austin Abro <AustinAbro321@gmail.com>
Date: Fri, 2 Aug 2024 14:34:11 +0000
Subject: [PATCH] cleanup dotnet

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
---
 .github/actions/cleanup-files/action.yaml |  1 +
 .github/workflows/nightly-eks.yml         | 16 ++--------------
 .github/workflows/test-e2e.yml            | 16 ++++++++++++++++
 .github/workflows/test-external.yml       |  2 +-
 .github/workflows/test-upgrade.yml        |  4 ++++
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/actions/cleanup-files/action.yaml b/.github/actions/cleanup-files/action.yaml
index d490cc086b..92cef844c5 100644
--- a/.github/actions/cleanup-files/action.yaml
+++ b/.github/actions/cleanup-files/action.yaml
@@ -9,6 +9,7 @@ runs:
 
         sudo rm -rf zarf-sbom /tmp/zarf-*
         sudo env "PATH=$PATH" CI=true make delete-packages
+        sudo rm -rf /usr/share/dotnet
         sudo build/zarf tools clear-cache
         sudo docker system prune --all --force
 
diff --git a/.github/workflows/nightly-eks.yml b/.github/workflows/nightly-eks.yml
index 3ea9aae5a9..35b94721b9 100644
--- a/.github/workflows/nightly-eks.yml
+++ b/.github/workflows/nightly-eks.yml
@@ -57,21 +57,9 @@ jobs:
       - name: Run tests
         run: make test-e2e-with-cluster ARCH=amd64
 
-      - name: get pods
+      - name: show cluster logs
+        uses: ./.github/actions/debug-cluster
         if: always()
-        run: kubectl get pods -n kiwix -o yaml
-
-      - name: describe pod
-        if: always()
-        run: kubectl describe pods -n kiwix
-
-      - name: get nodes
-        if: always()
-        run: kubectl get nodes -o yaml
-
-      - name: describe nodes
-        if: always()
-        run: kubectl describe nodes
 
       - name: Teardown the cluster
         if: always()
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index b3fee07a16..069471bfe8 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -119,6 +119,10 @@ jobs:
         run: |
           make test-e2e-with-cluster ARCH=amd64
 
+      - name: get cluster info
+        uses: ./.github/actions/debug-cluster
+        if: always()
+
       - name: Save logs
         if: always()
         uses: ./.github/actions/save-logs
@@ -157,6 +161,10 @@ jobs:
         run: |
           sudo env "PATH=$PATH" CI=true APPLIANCE_MODE=true make test-e2e-with-cluster ARCH=amd64
 
+      - name: get cluster info
+        uses: ./.github/actions/debug-cluster
+        if: always()
+
       - name: Save logs
         if: always()
         uses: ./.github/actions/save-logs
@@ -197,6 +205,10 @@ jobs:
         run: |
           make test-e2e-with-cluster ARCH=amd64
 
+      - name: get cluster info
+        uses: ./.github/actions/debug-cluster
+        if: always()
+
       - name: Save logs
         if: always()
         uses: ./.github/actions/save-logs
@@ -235,6 +247,10 @@ jobs:
         run: |
           make test-e2e-with-cluster ARCH=amd64
 
+      - name: get cluster info
+        uses: ./.github/actions/debug-cluster
+        if: always()
+
       - name: Save logs
         if: always()
         uses: ./.github/actions/save-logs
diff --git a/.github/workflows/test-external.yml b/.github/workflows/test-external.yml
index 7073957aa7..a529cf19cd 100644
--- a/.github/workflows/test-external.yml
+++ b/.github/workflows/test-external.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Run external service test
         run: make test-external
 
-      - name: show cluster logs
+      - name: get cluster info
         uses: ./.github/actions/debug-cluster
         if: always()
 
diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml
index a86c02e5cc..6a73cfe299 100644
--- a/.github/workflows/test-upgrade.yml
+++ b/.github/workflows/test-upgrade.yml
@@ -123,6 +123,10 @@ jobs:
 
           sudo env "PATH=$PATH" CI=true make test-upgrade ARCH=amd64
 
+      - name: get cluster info
+        uses: ./.github/actions/debug-cluster
+        if: always()
+
       - name: Save logs
         if: always()
         uses: ./.github/actions/save-logs