ci: Updating workflows

.github/workflows/pr.yml

@@ -50,6 +50,7 @@ jobs:
           AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
           AWS_DEFAULT_REGION: us-east-1
+          ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
         run: |
           sudo apt update
           echo "Installing curl and unzip"
@@ -68,7 +69,7 @@ jobs:
           echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
 
           echo "Creating bucket: $BUCKET"
-          aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
+          aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
 
       - name: Run tests
         env:
@@ -79,10 +80,10 @@ jobs:
           ROOT_DIRECTORY: "/tmp"
           AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
-          AWS_DEFAULT_REGION: us-east-1
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
           GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
           GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
-          GARAGE_S3_REGION: us-east-1
+          GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
           S3_BUCKET_NAME: ${{ env.S3_BUCKET }}
           S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
           AWS_S3_FORCE_PATH_STYLE: "true"
@@ -95,17 +96,14 @@ jobs:
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/soaricarus_models_deploy_key
 
-          echo "Bucket: $S3_BUCKET"
-          echo "S3 Bucket: $S3_BUCKET_NAME"
-
           cargo test
 
       - name: Cleanup
         if: always()
         run: |
-          echo "Cleaning up bucket ${{ env.S3_BUCKET }}"
-          echo "Region: ${{ env.AWS_DEFAULT_REGION }}"
-          echo "B: $BUCK"
+          echo "Cleaning up bucket $BUCK"
+          echo "Region: $AWS_DEFAULT_REGION"
+
           aws --endpoint-url=$ENDPOINT_URL \
               s3 rb s3://$BUCK --force \
               --region $AWS_DEFAULT_REGION