Skip to content

Commit

Permalink
merge: #15222
Browse files Browse the repository at this point in the history
15222: [Backport stable/8.3] Stabilize S3BackupAcceptanceIT#shouldDeleteBackup r=npepinpe a=backport-action

# Description
Backport of #15210 to `stable/8.3`.

relates to #14344
original author: `@npepinpe`

Co-authored-by: Nicolas Pepin-Perreault <nicolas.pepin-perreault@camunda.com>
  • Loading branch information
zeebe-bors-camunda[bot] and npepinpe committed Nov 15, 2023
2 parents f2f7487 + 8fd92b9 commit 0d46073
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down

0 comments on commit 0d46073

Please sign in to comment.