From a97c7be00d0da9facd829ef2dddf90c5dc0979e4 Mon Sep 17 00:00:00 2001 From: Andrew Gaul <andrew@gaul.org> Date: Tue, 24 Dec 2024 08:27:49 -0500 Subject: [PATCH] Run s3-tests against minio --- .github/workflows/ci-main.yml | 5 ++++- pom.xml | 2 +- src/test/resources/run-s3-tests.sh | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 5d77d8aa..b79a2440 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -108,7 +108,6 @@ jobs: run: | # TODO: run other test classes mvn test -Ds3proxy.test.conf=s3proxy-minio.conf -Dtest=AwsSdkTest - kill $(pidof minio) - name: Install s3-tests run: | @@ -124,6 +123,10 @@ jobs: 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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>11</java.version> - <jclouds.version>2.6.0</jclouds.version> + <jclouds.version>2.6.1-SNAPSHOT</jclouds.version> <jetty.version>11.0.24</jetty.version> <slf4j.version>2.0.16</slf4j.version> <shade.prefix>${project.groupId}.shaded</shade.prefix> diff --git a/src/test/resources/run-s3-tests.sh b/src/test/resources/run-s3-tests.sh index 2ad99aa6..64ed5b88 100755 --- a/src/test/resources/run-s3-tests.sh +++ b/src/test/resources/run-s3-tests.sh @@ -56,6 +56,8 @@ tags='not fails_on_s3proxy'\ 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