From 39b66f2ef596dba26c521d49a07ba3f3aaa8722b Mon Sep 17 00:00:00 2001
From: strophy <badfunkstripe@gmail.com>
Date: Fri, 3 Nov 2023 18:37:23 +1000
Subject: [PATCH] ci: use ecr image names in ci

---
 .github/workflows/tests-build-images.yml | 1 -
 .github/workflows/tests-test-suite.yml   | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests-build-images.yml b/.github/workflows/tests-build-images.yml
index 5caf8a9987..e1c5bc41b0 100644
--- a/.github/workflows/tests-build-images.yml
+++ b/.github/workflows/tests-build-images.yml
@@ -132,7 +132,6 @@ jobs:
         run: |
           aws ecr get-login-password --region ${{ vars.AWS_REGION }} | docker login --username AWS --password-stdin ${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com
           GIT_SHA=$(git rev-parse --short HEAD)
-          echo "GIT_SHA=$GIT_SHA" >> $GITHUB_ENV
           images=("dapi:local" "drive:local" "dashmate_helper:local")
           for image in "${images[@]}"; do
             new_image_tag="${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com/${image%:local}:$GIT_SHA"
diff --git a/.github/workflows/tests-test-suite.yml b/.github/workflows/tests-test-suite.yml
index 0db64af547..87cfad9596 100644
--- a/.github/workflows/tests-test-suite.yml
+++ b/.github/workflows/tests-test-suite.yml
@@ -55,9 +55,10 @@ jobs:
           # collect drive logs for bench suite
           yarn dashmate config set --config=local platform.drive.abci.logs.stdout.level “trace”
           # set docker image names
-          yarn dashmate config set --config=local platform.drive.abci.docker.image drive:${{ github.sha }}
-          yarn dashmate config set --config=local platform.dapi.api.docker.image dapi:${{ github.sha }}
-          yarn dashmate config set --config=local dashmate.helper.docker.image dashmate_helper:${{ github.sha }}
+          GIT_SHA=$(git rev-parse --short HEAD)
+          yarn dashmate config set --config=local platform.drive.abci.docker.image ${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com/drive:$GIT_SHA
+          yarn dashmate config set --config=local platform.dapi.api.docker.image dapi:${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com/dapi:$GIT_SHA
+          yarn dashmate config set --config=local dashmate.helper.docker.image dashmate_helper:${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com/dashmate_helper:$GIT_SHA
 
           source ./scripts/setup_local_network.sh
           source ./scripts/configure_test_suite.sh