diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 0b644384..b79a2440 100644 --- 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,13 +103,11 @@ 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: | # TODO: run other test classes mvn test -Ds3proxy.test.conf=s3proxy-minio.conf -Dtest=AwsSdkTest - kill $(pidof minio) - name: Install s3-tests run: | @@ -125,6 +122,11 @@ jobs: - name: Run s3-tests with Azurite run: | ./src/test/resources/run-s3-tests.sh s3proxy-azurite.conf + kill $(pidof node) + - name: Run s3-tests with Minio + run: | + ./src/test/resources/run-s3-tests.sh s3proxy-minio.conf + kill $(pidof minio) #Store the target - uses: actions/upload-artifact@v4 diff --git a/pom.xml b/pom.xml index 81e39462..bff66f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -364,7 +364,7 @@ UTF-8 11 - 2.6.0 + 2.6.1-SNAPSHOT 11.0.24 2.0.16 ${project.groupId}.shaded diff --git a/src/test/resources/run-s3-tests.sh b/src/test/resources/run-s3-tests.sh index 421b14ec..64ed5b88 100755 --- 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,12 @@ 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-minio.conf" ]; then + tags="${tags} and not fails_on_s3proxy_minio" +elif [ "${S3PROXY_CONF}" = "s3proxy-transient-nio2.conf" ]; then + tags="${tags} and not fails_on_s3proxy_nio2" fi # execute s3-tests