fix smoke tests

TykTechnologies · Nov 15, 2023 · 846cf58 · 846cf58
1 parent 1760ae2
commit 846cf58
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -278,6 +278,20 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
+
+      - uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::754489498669:role/ecr_rw_tyk
+          role-session-name: cipush
+          aws-region: eu-central-1
+          # Don't mask to pass it across job boundaries
+          mask-aws-account-id: false
+
+      - uses: aws-actions/amazon-ecr-login@v1
+        id: ecr
+        with:
+          mask-password: 'true'
+
       - name: Run ci/tests
         shell: bash
         env:        
@@ -296,7 +310,7 @@ jobs:
               echo Attempting to test $d
               if [ -d $d ] && [ -e $d/test.sh ]; then
                   cd $d
-                  ./test.sh ${{ needs.goreleaser.outputs.tags }}
+                  ./test.sh ${{ steps.ecr.outputs.registry }}/tyk-pump:sha-${{ github.sha }}
                   cd -
               fi
           done
@@ -305,7 +319,7 @@ jobs:
               echo Attempting to test $d
               if [ -d $d ] && [ -e $d/test.sh ]; then
                   cd $d
-                  ./test.sh ${{ needs.goreleaser.outputs.tags }}
+                  ./test.sh ${{ steps.ecr.outputs.registry }}/tyk-pump:sha-${{ github.sha }}
                   cd -
               fi
           done

diff --git a/ci/tests/csvpump/docker-compose.yml b/ci/tests/csvpump/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       timeout: 10s
 
   pump:
-    image: tykio/tyk-pump-docker-pub:${tag}
+    image: ${pump_image}
     volumes:
       - ./confs/tyk-pump.conf:/conf/tyk-pump.conf
       - /tmp/pump-data:/pump-data

diff --git a/ci/tests/csvpump/test.sh b/ci/tests/csvpump/test.sh
@@ -36,7 +36,7 @@ function warn {
 DEFAULT_GW_TAG=v4.0.1
 
 [[ -z $1 ]] && usage "$0"
-export tag=$1
+export pump_image=$1
 export gwtag=$2
 
 if [[ -z $2 ]]; then