From d87c437862c16b7cf3d66e312ddc312e21de3166 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 29 Oct 2020 19:06:53 -0700 Subject: [PATCH] Fix release script distribution check Update `BintrayService.isDistributionComplete` to use unpublished artifacts. --- .../concourse/releasescripts/bintray/BintrayService.java | 2 +- .../releasescripts/bintray/BintrayServiceTests.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java index ed22c3c91f99..98a075fa5a5a 100644 --- a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java +++ b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java @@ -97,7 +97,7 @@ public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set requi public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set requiredDigests, Duration timeout, Duration pollInterval) { logger.debug("Checking if distribution is complete"); - RequestEntity request = getPackageFilesRequest(releaseInfo, 0); + RequestEntity request = getPackageFilesRequest(releaseInfo, 1); try { waitAtMost(timeout).with().pollDelay(Duration.ZERO).pollInterval(pollInterval).until(() -> { logger.debug("Checking Bintray"); diff --git a/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/bintray/BintrayServiceTests.java b/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/bintray/BintrayServiceTests.java index e88780cf2c24..68de238c1656 100644 --- a/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/bintray/BintrayServiceTests.java +++ b/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/bintray/BintrayServiceTests.java @@ -77,9 +77,9 @@ void tearDown() { @Test void isDistributionComplete() throws Exception { - setupGetPackageFiles(0, "no-package-files.json"); - setupGetPackageFiles(0, "some-package-files.json"); - setupGetPackageFiles(0, "all-package-files.json"); + setupGetPackageFiles(1, "no-package-files.json"); + setupGetPackageFiles(1, "some-package-files.json"); + setupGetPackageFiles(1, "all-package-files.json"); Set digests = new LinkedHashSet<>(); digests.add("602e20176706d3cc7535f01ffdbe91b270ae5012"); digests.add("602e20176706d3cc7535f01ffdbe91b270ae5013");