Added wait time to wait for circle ci

Author: marcingrzejszczak

src/main/java/io/micrometer/release/train/CircleCiChecker.java

@@ -15,6 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.net.http.HttpResponse.BodyHandlers;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,48 +45,69 @@ class CircleCiChecker {
 
     private final String externalUrl;
 
+    private final int waitTimeMs;
+
+    private final int numberOfRetries;
+
     CircleCiChecker(String circleCiToken, String githubOrgRepo, HttpClient httpClient, ObjectMapper objectMapper) {
         this.circleCiToken = circleCiToken;
         this.githubOrgRepo = githubOrgRepo;
         this.httpClient = httpClient;
         this.objectMapper = objectMapper;
         this.externalUrl = System.getenv("CI_URL") != null ? System.getenv("CI_URL") : CIRCLE_URL;
+        this.waitTimeMs = 5 * 1000;
+        this.numberOfRetries = 3;
     }
 
     CircleCiChecker(String circleCiToken, String githubOrgRepo, HttpClient httpClient, ObjectMapper objectMapper,
-            String externalUrl) {
+            String externalUrl, int waitTimeMs, int numberOfRetries) {
         this.circleCiToken = circleCiToken;
         this.githubOrgRepo = githubOrgRepo;
         this.httpClient = httpClient;
         this.objectMapper = objectMapper;
         this.externalUrl = externalUrl;
+        this.waitTimeMs = waitTimeMs;
+        this.numberOfRetries = numberOfRetries;
     }
 
     boolean checkBuildStatus(String version) throws IOException, InterruptedException {
         log.info("Checking CircleCI status for version: [{}]", version);
         String tag = "v" + version;
         String apiUrl = externalUrl + "project/github/" + githubOrgRepo + "/pipeline";
-        int pageCount = 0;
-        // Limit to 2 pages - there shouldn't be more jobs to search against
-        while (apiUrl != null && pageCount < 2) {
-            HttpRequest request = getCircleHttpRequest(apiUrl);
-            HttpResponse<String> response = sendPipelineRequest(request);
-            PipelineResponse pipelineResponse = objectMapper.readValue(response.body(), PipelineResponse.class);
-            for (Pipeline pipeline : pipelineResponse.items()) {
-                if (tag.equals(pipeline.vcs().tag())) {
-                    return checkWorkflowStatus(pipeline.id());
+        log.info("Waiting for [{}] ms for the CircleCI build to appear", waitTimeMs);
+        Thread.sleep(waitTimeMs);
+        log.info("Will try [{}] times with wait time [{}] ms to check if the build in CircleCI appeared",
+                numberOfRetries, waitTimeMs);
+        for (int i = 0; i < numberOfRetries; i++) {
+            int pageCount = 0;
+            // Limit to 2 pages - there shouldn't be more jobs to search against
+            while (apiUrl != null && pageCount < 2) {
+                HttpRequest request = getCircleHttpRequest(apiUrl);
+                PipelineResponse pipelineResponse = getPipelineResponse(request);
+                for (Pipeline pipeline : pipelineResponse.items()) {
+                    if (tag.equals(pipeline.vcs().tag())) {
+                        return checkWorkflowStatus(pipeline.id());
+                    }
                 }
+                apiUrl = pipelineResponse.nextPageToken() != null
+                        ? apiUrl + "?page-token=" + pipelineResponse.nextPageToken() : null;
+                pageCount++;
+                log.info("The tag [{}] was not found in this page, trying page [{}]", tag, pageCount);
             }
-            apiUrl = pipelineResponse.nextPageToken() != null
-                    ? apiUrl + "?page-token=" + pipelineResponse.nextPageToken() : null;
-            pageCount++;
-            log.info("The tag [{}] was not found in this page, trying page [{}]", tag, pageCount);
+            log.info("Try [{}/{}] - no CircleCI pipeline found for tag [{}], will try again in [{}] ms", i + 1,
+                    numberOfRetries, tag, waitTimeMs);
+            Thread.sleep(waitTimeMs);
         }
         throw new IllegalStateException("No CircleCI pipeline found for tag [" + tag + "]");
     }
 
+    private PipelineResponse getPipelineResponse(HttpRequest request) throws IOException, InterruptedException {
+        HttpResponse<String> response = sendPipelineRequest(request);
+        return objectMapper.readValue(response.body(), PipelineResponse.class);
+    }
+
     private HttpResponse<String> sendPipelineRequest(HttpRequest request) throws IOException, InterruptedException {
-        return httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        return httpClient.send(request, BodyHandlers.ofString());
     }
 
     private boolean checkWorkflowStatus(String pipelineId) throws IOException, InterruptedException {
@@ -106,7 +130,7 @@ private boolean checkWorkflowStatus(String pipelineId) throws IOException, Inter
     }
 
     private HttpResponse<String> sendWorkflowRequest(HttpRequest request) throws IOException, InterruptedException {
-        return httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        return httpClient.send(request, BodyHandlers.ofString());
     }
 
     private HttpRequest getCircleHttpRequest(String workflowUrl) {

src/main/java/io/micrometer/release/train/DependencyVerifier.java

@@ -231,8 +231,9 @@ private void waitForDependabotJobsToFinish(String orgRepository, String githubSe
     }
 
     List<String> curlRuns(String orgRepository, String githubServerTime, String id) {
-        return processRunner.run("curl", "-H", "Authorization: token " + ghToken(), "https://api.github.com/repos/"
-                + orgRepository + "/actions/runs?created=>" + githubServerTime + "&workflow_id=" + id);
+        return processRunner.runSilently("curl", "-H", "Authorization: token " + ghToken(),
+                "https://api.github.com/repos/" + orgRepository + "/actions/runs?created=>" + githubServerTime
+                        + "&workflow_id=" + id);
     }
 
     private String getDependabotupdatesWorkflowId(String orgRepository) {

src/test/java/io/micrometer/release/train/CircleCiCheckerTests.java

@@ -71,7 +71,7 @@ void should_throw_exception_when_at_least_one_workflow_step_failed() {
 
     static CircleCiChecker getChecker(String status, String url) {
         return new CircleCiChecker("foo", "micrometer-metrics/micrometer", HttpClient.newBuilder().build(),
-                new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false), url) {
+                new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false), url, 1, 1) {
             @Override
             Builder requestBuilder(String workflowUrl) {
                 return super.requestBuilder(workflowUrl).header("Test-Status", status);

src/test/java/io/micrometer/release/train/DependencyVerifierTests.java

@@ -93,7 +93,7 @@ ProcessRunner processRunnerForBranch(File clonedRepo) {
     @BeforeEach
     void setup() throws URISyntaxException, IOException {
         given(processRunner.run(dependabotUpdateJobsIds)).willReturn(List.of("1234"));
-        given(processRunner.run(dependabotUpdateJobStates)).willReturn(Files
+        given(processRunner.runSilently(dependabotUpdateJobStates)).willReturn(Files
             .readAllLines(new File(DependencyVerifierTests.class.getResource("/github/runs.json").toURI()).toPath()));
         given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
     }
@@ -136,7 +136,7 @@ void should_fail_when_no_dependabot_jobs_present() {
     @Test
     @SuppressWarnings("unchecked")
     void should_fail_when_dependabot_jobs_are_not_successful() {
-        given(processRunner.run(dependabotUpdateJobStates)).willReturn(List.of("", """
+        given(processRunner.runSilently(dependabotUpdateJobStates)).willReturn(List.of("", """
                           {
                 "total_count": 15,
                 "workflow_runs": [