Clean up tags in s3-tests

gaul · Dec 25, 2024 · f4af3c8 · f4af3c8
1 parent e59116f
commit f4af3c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -95,7 +95,6 @@ jobs:
         run: |
           # TODO: run other test classes
           mvn test -Ds3proxy.test.conf=s3proxy-azurite.conf -Dtest=AwsSdkTest
-          # TODO: kill $(pidof node)
 
       - name: Install Minio
         run: |
@@ -104,7 +103,6 @@ jobs:
       - name: Start Minio
         run: |
           mkdir mnt/
-          # TODO: kill this afterwards
           MINIO_SERVER_URL=http://127.0.0.1:9000 MINIO_ROOT_USER=remote-identity MINIO_ROOT_PASSWORD=remote-credential ./minio server mnt/ &
       - name: Maven Test with Minio
         run: |
@@ -125,6 +123,7 @@ jobs:
       - name: Run s3-tests with Azurite
         run: |
           ./src/test/resources/run-s3-tests.sh s3proxy-azurite.conf
+          kill $(pidof node)
 
       #Store the target
       - uses: actions/upload-artifact@v4

diff --git a/src/test/resources/run-s3-tests.sh b/src/test/resources/run-s3-tests.sh
@@ -38,8 +38,6 @@ tags='not fails_on_s3proxy'\
 ' and not copy'\
 ' and not cors'\
 ' and not encryption'\
-' and not fails_on_s3proxy_azureblob'\
-' and not fails_on_s3proxy_nio2'\
 ' and not fails_strict_rfc2616'\
 ' and not iam_tenant'\
 ' and not lifecycle'\
@@ -56,7 +54,10 @@ tags='not fails_on_s3proxy'\
 ' and not webidentity_test'
 
 if [ "${S3PROXY_CONF}" = "s3proxy-azurite.conf" ]; then
+    tags="${tags} and not fails_on_s3proxy_azureblob"
     tags="${tags} and not multipart"
+elif [ "${S3PROXY_CONF}" = "s3proxy-transient-nio2.conf" ]; then
+    tags="${tags} and not fails_on_s3proxy_nio2"
 fi
 
 # execute s3-tests