From a5ecb7f585c32db42f435f488d82b8e112b2f483 Mon Sep 17 00:00:00 2001
From: hz <zeeshaun@gmail.com>
Date: Tue, 19 May 2026 04:57:18 -0500
Subject: [PATCH] Updating jobs to better cleanup

---
 .gitea/workflows/deploy-auth.yml      | 16 ++++++++++++----
 .gitea/workflows/deploy-locations.yml | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy-auth.yml b/.gitea/workflows/deploy-auth.yml
index ddad582..2037edb 100644
--- a/.gitea/workflows/deploy-auth.yml
+++ b/.gitea/workflows/deploy-auth.yml
@@ -12,7 +12,8 @@ jobs:
 
     env:
       IMAGE_NAME: territory-autobattler-auth:latest
-      IMAGE_TAR: /tmp/territory-autobattler-auth.tar
+      IMAGE_TAR: ${{ github.workspace }}/territory-autobattler-auth.tar
+      REMOTE_IMAGE_TAR: /home/hz/territory-autobattler-auth.tar
       NAMESPACE: territory-autobattler
       DEPLOYMENT_NAME: territory-autobattler-auth
       NODES: "192.168.86.72 192.168.86.73 192.168.86.74"
@@ -26,6 +27,10 @@ jobs:
           cd microservices/AuthApi
           docker build -t "${IMAGE_NAME}" .
 
+      - name: Clean stale TAR on runner
+        run: |
+          rm -f "${IMAGE_TAR}"
+
       - name: Save Docker image to TAR
         run: |
           docker save "${IMAGE_NAME}" -o "${IMAGE_TAR}"
@@ -34,24 +39,27 @@ jobs:
         run: |
           for node in ${NODES}; do
             echo "Copying image tar to $node ..."
-            scp -o StrictHostKeyChecking=no "${IMAGE_TAR}" hz@"$node":"${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${REMOTE_IMAGE_TAR}"
+            scp -o StrictHostKeyChecking=no "${IMAGE_TAR}" hz@"$node":"${REMOTE_IMAGE_TAR}"
           done
 
       - name: Import image on nodes
         run: |
           for node in ${NODES}; do
             echo "Importing image on $node ..."
-            ssh -o StrictHostKeyChecking=no hz@"$node" "sudo ctr -n k8s.io images import ${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "sudo ctr -n k8s.io images import ${REMOTE_IMAGE_TAR}"
           done
 
       - name: Clean TAR from nodes
+        if: always()
         run: |
           for node in ${NODES}; do
             echo "Removing image tar on $node ..."
-            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${REMOTE_IMAGE_TAR}"
           done
 
       - name: Clean TAR on runner
+        if: always()
         run: |
           rm -f "${IMAGE_TAR}"
 
diff --git a/.gitea/workflows/deploy-locations.yml b/.gitea/workflows/deploy-locations.yml
index 306fee1..c730037 100644
--- a/.gitea/workflows/deploy-locations.yml
+++ b/.gitea/workflows/deploy-locations.yml
@@ -12,7 +12,8 @@ jobs:
 
     env:
       IMAGE_NAME: territory-autobattler-locations:latest
-      IMAGE_TAR: /tmp/territory-autobattler-locations.tar
+      IMAGE_TAR: ${{ github.workspace }}/territory-autobattler-locations.tar
+      REMOTE_IMAGE_TAR: /home/hz/territory-autobattler-locations.tar
       NAMESPACE: territory-autobattler
       DEPLOYMENT_NAME: territory-autobattler-locations
       NODES: "192.168.86.72 192.168.86.73 192.168.86.74"
@@ -26,6 +27,10 @@ jobs:
           cd microservices/LocationsApi
           docker build -t "${IMAGE_NAME}" .
 
+      - name: Clean stale TAR on runner
+        run: |
+          rm -f "${IMAGE_TAR}"
+
       - name: Save Docker image to TAR
         run: |
           docker save "${IMAGE_NAME}" -o "${IMAGE_TAR}"
@@ -34,24 +39,27 @@ jobs:
         run: |
           for node in ${NODES}; do
             echo "Copying image tar to $node ..."
-            scp -o StrictHostKeyChecking=no "${IMAGE_TAR}" hz@"$node":"${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${REMOTE_IMAGE_TAR}"
+            scp -o StrictHostKeyChecking=no "${IMAGE_TAR}" hz@"$node":"${REMOTE_IMAGE_TAR}"
           done
 
       - name: Import image on nodes
         run: |
           for node in ${NODES}; do
             echo "Importing image on $node ..."
-            ssh -o StrictHostKeyChecking=no hz@"$node" "sudo ctr -n k8s.io images import ${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "sudo ctr -n k8s.io images import ${REMOTE_IMAGE_TAR}"
           done
 
       - name: Clean TAR from nodes
+        if: always()
         run: |
           for node in ${NODES}; do
             echo "Removing image tar on $node ..."
-            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${IMAGE_TAR}"
+            ssh -o StrictHostKeyChecking=no hz@"$node" "rm -f ${REMOTE_IMAGE_TAR}"
           done
 
       - name: Clean TAR on runner
+        if: always()
         run: |
           rm -f "${IMAGE_TAR}"