From b892eae79997438fa5351b77766900b1afae5823 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 15 May 2024 18:37:43 -0400
Subject: [PATCH] chore: fix tester image copy pattern (#6438)

Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com>
---
 .github/ensure-tester-with-images/action.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ensure-tester-with-images/action.yml b/.github/ensure-tester-with-images/action.yml
index 52bb975d223..f3f313988f1 100644
--- a/.github/ensure-tester-with-images/action.yml
+++ b/.github/ensure-tester-with-images/action.yml
@@ -41,9 +41,9 @@ runs:
             docker images --no-trunc --quiet \$image
           done" > .success_key
         # TODO better image key
-        echo "IMAGE_KEY=$(git rev-parse HEAD)" >> $GITHUB_ENV
+        echo "IMAGE_KEY=$(cat .success_key | md5sum | awk '{print $1}')-$(git rev-parse HEAD)" >> $GITHUB_ENV
         echo "${{ inputs.run }}" >> .success_key
-        echo "SUCCESS_KEY=$(cat .success_key | md5sum | awk '{print $1}') " >> $GITHUB_ENV
+        echo "SUCCESS_KEY=$(cat .success_key | md5sum | awk '{print $1}')" >> $GITHUB_ENV
 
     - name: Check Cached Success
       uses: ./.github/cache-success
@@ -64,7 +64,7 @@ runs:
 
             sudo flock /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.lock bash -c '
               if ! [ -f /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli ] ; then
-                docker save aztecprotocol/aztec:${{ env.IMAGE_KEY }} aztecprotocol/end-to-end:${{ env.IMAGE_KEY }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
+                docker save ${{ inputs.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
                 mv /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
               fi'
             sudo cat /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
@@ -74,4 +74,4 @@ runs:
       uses: ./.github/run-on-tester
       if: ${{ env.CACHE_SUCCESS != 'true' }}
       with:
-        run: ${{ inputs.run }}
\ No newline at end of file
+        run: ${{ inputs.run }}