Skip to content

Commit d7f2113

Browse files
authored
Upgrade tests to MinIO RELEASE.2025-06-13T11-33-47Z (#129920) (#129991)
New MinIO release just dropped, migrating the tests to use it and dropping the workaround for known issues in older versions.
1 parent f1d1d20 commit d7f2113

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public final class MinioTestContainer extends DockerEnvironmentAwareTestContaine
1717

1818
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
1919
// However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround
20-
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
20+
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-06-13T11-33-47Z";
2121

2222
private static final int servicePort = 9000;
2323
private final boolean enabled;

x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
3333
.keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key")
3434
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
3535
.setting("xpack.security.enabled", "false")
36-
// Skip listing of pre-existing uploads during a CAS because MinIO sometimes leaks them; also reduce the delay before proceeding
37-
// TODO do not set these if running a MinIO version in which https://github.com/minio/minio/issues/21189 is fixed
38-
.setting("repository_s3.compare_and_exchange.time_to_live", "-1")
39-
.setting("repository_s3.compare_and_exchange.anti_contention_delay", "100ms")
4036
.setting("xpack.ml.enabled", "false")
4137
.build();
4238

0 commit comments

Comments
 (0)