Merge pull request #4994 from dolthub/dhruv/fix-aws-remotes-ci

Fix remotes-aws.bats for __DOLT__

.github/workflows/ci-bats-unix.yaml

@@ -30,13 +30,19 @@ jobs:
       use_credentials: ${{ secrets.AWS_SECRET_ACCESS_KEY != '' && secrets.AWS_ACCESS_KEY_ID != '' }}
     steps:
       - name: Conditionally Set ENV VARS for AWS tests
+        env:
+          DOLT_FMT: ${{ matrix.dolt_fmt }}
         run: |
           if [[ $use_credentials == true ]]; then
             echo "AWS_SDK_LOAD_CONFIG=1" >> $GITHUB_ENV
             echo "AWS_REGION=us-west-2" >> $GITHUB_ENV
             echo "DOLT_BATS_AWS_TABLE=dolt-ci-bats-manifests-us-west-2" >> $GITHUB_ENV
             echo "DOLT_BATS_AWS_BUCKET=dolt-ci-bats-chunks-us-west-2" >> $GITHUB_ENV
-            echo "DOLT_BATS_AWS_EXISTING_REPO=aws_remote_bats_tests" >> $GITHUB_ENV
+            if [[ "$DOLT_FMT" == "__DOLT__" ]]; then
+                echo "DOLT_BATS_AWS_EXISTING_REPO=aws_remote_bats_tests__dolt__" >> $GITHUB_ENV
+            else
+                echo "DOLT_BATS_AWS_EXISTING_REPO=aws_remote_bats_tests" >> $GITHUB_ENV
+            fi
           fi
       - name: Configure AWS Credentials
         if: ${{ env.use_credentials == 'true' }}

integration-tests/bats/remotes-aws.bats

@@ -4,7 +4,6 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
-    skip_nbf_dolt "need to add a __DOLT__ repo for AWS tests"
 }
 
 teardown() {