From bc38fafb7c0336b3a7eef806e02b8b1d145c3bc9 Mon Sep 17 00:00:00 2001 From: Nicolas Pepin-Perreault Date: Wed, 15 Nov 2023 12:12:02 +0100 Subject: [PATCH 1/2] refactor(qa): use liveness check as start strategy (cherry picked from commit 6122469ec6f66235c42f5f34829f6562343d0257) --- .../io/camunda/zeebe/qa/util/testcontainers/MinioContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/util/src/main/java/io/camunda/zeebe/qa/util/testcontainers/MinioContainer.java b/qa/util/src/main/java/io/camunda/zeebe/qa/util/testcontainers/MinioContainer.java index 965836b9e82c..3946e302a2dd 100644 --- a/qa/util/src/main/java/io/camunda/zeebe/qa/util/testcontainers/MinioContainer.java +++ b/qa/util/src/main/java/io/camunda/zeebe/qa/util/testcontainers/MinioContainer.java @@ -65,7 +65,7 @@ public MinioContainer(final String version) { public WaitStrategy defaultWaitStrategy() { return new HttpWaitStrategy() - .forPath("/minio/health/ready") + .forPath("/minio/health/live") .forPort(PORT) .withStartupTimeout(Duration.ofMinutes(1)); } From 8fd92b99724da4fdbf01741d51f149891e0e7d50 Mon Sep 17 00:00:00 2001 From: Nicolas Pepin-Perreault Date: Wed, 15 Nov 2023 12:12:19 +0100 Subject: [PATCH 2/2] refactor(qa): retry bucket creation in case of 503 (cherry picked from commit 4bb4726bd157c156428714062c00568f2c7c56cb) --- .../io/camunda/zeebe/it/backup/S3BackupAcceptanceIT.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qa/integration-tests/src/test/java/io/camunda/zeebe/it/backup/S3BackupAcceptanceIT.java b/qa/integration-tests/src/test/java/io/camunda/zeebe/it/backup/S3BackupAcceptanceIT.java index 5225d29df3ec..5299a1955aa9 100644 --- a/qa/integration-tests/src/test/java/io/camunda/zeebe/it/backup/S3BackupAcceptanceIT.java +++ b/qa/integration-tests/src/test/java/io/camunda/zeebe/it/backup/S3BackupAcceptanceIT.java @@ -91,7 +91,13 @@ void beforeEach() { store = new S3BackupStore(config); try (final var client = S3BackupStore.buildClient(config)) { - client.createBucket(builder -> builder.bucket(config.bucketName()).build()).join(); + // it's possible to query to fast and get a 503 from the server here, so simply retry after + Awaitility.await("unil bucket is created") + .untilAsserted( + () -> + client + .createBucket(builder -> builder.bucket(config.bucketName()).build()) + .join()); } // we have to configure the cluster here, after minio is started, as otherwise we won't have