From e77968d5296c9b34a33e39d2d38c03952c989af9 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 25 Jun 2025 10:22:41 +0100 Subject: [PATCH] Upgrade tests to MinIO `RELEASE.2025-06-13T11-33-47Z` (#129920) New MinIO release just dropped, migrating the tests to use it and dropping the workaround for known issues in older versions. (cherry picked from commit 138f3508401904b77ba656bee019eedecb7c3dd0) --- .../elasticsearch/test/fixtures/minio/MinioTestContainer.java | 4 +++- .../testkit/analyze/MinioRepositoryAnalysisRestIT.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java b/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java index ae3eb224d6886..4221a7e92d20e 100644 --- a/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java +++ b/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java @@ -16,7 +16,9 @@ public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer { private static final int servicePort = 9000; - public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z"; + // NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround + // However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround + public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-06-13T11-33-47Z"; private final boolean enabled; public MinioTestContainer(boolean enabled, String accessKey, String secretKey, String bucketName) { diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java b/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java index 3b5edaf768057..481e9ec80ec94 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java @@ -34,7 +34,6 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes .setting("s3.client.repository_test_kit.protocol", () -> "http") .setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress) .setting("xpack.security.enabled", "false") - // Additional tracing related to investigation into https://github.com/elastic/elasticsearch/issues/102294 .setting("xpack.ml.enabled", "false") .build();