Fixed resetting of repos

Author: marcingrzejszczak

src/e2eTest/java/io/micrometer/release/single/SingleProjectGithubActionsE2eTests.java

@@ -96,7 +96,7 @@ void should_verify_generic_milestone() throws JsonProcessingException {
 
     private static void runPostReleaseWorkflow() {
         log.info("Running post release action from tag");
-        GithubActions.runWorkflow("post-release-workflow.yml", List.of("gh", "workflow", "run",
+        GithubActions.runWorkflow("post-release-workflow.yml", "v0.1.1", List.of("gh", "workflow", "run",
                 "post-release-workflow.yml", "--ref", "v0.1.1", "-f", "previous_ref_name=v0.1.0"));
     }
 

src/e2eTest/java/io/micrometer/release/train/TrainGithubActionsE2eTests.java

@@ -136,7 +136,7 @@ void should_verify_generic_milestone(String branch) throws JsonProcessingExcepti
 
     private static void runTrainPostReleaseWorkflow() {
         log.info("Running train release from main");
-        GithubActions.runWorkflow("release-train-workflow.yml",
+        GithubActions.runWorkflow("release-train-workflow.yml", "main",
                 List.of("gh", "workflow", "run", "release-train-workflow.yml", "--ref", "main", "-f",
                         "train_versions=0.1.1,0.2.0-M2,1.0.0-RC1", "-f", "artifact_to_check=micrometer-bom"));
     }

src/test/java/io/micrometer/release/common/GithubActions.java

@@ -55,30 +55,38 @@ static void resetsMilestones() throws InterruptedException {
 
     private static void resetMilestones() throws InterruptedException {
         log.info("Resetting repository state");
-        processRunner.run("gh", "workflow", "run", "reset-milestones.yml");
-        waitForWorkflowCompletion("reset-milestones.yml");
+        runAndWaitResetMiestones("0.1.x");
+        runAndWaitResetMiestones("0.2.x");
+        runAndWaitResetMiestones("main");
     }
 
-    static void runWorkflow(String workflowName, List<String> commands) {
+    private static void runAndWaitResetMiestones(String branch) throws InterruptedException {
+        log.info("Resetting branch {}", branch);
+        processRunner.run("gh", "workflow", "run", "reset-milestones.yml", "-r", branch);
+        waitForWorkflowCompletion("reset-milestones.yml", branch);
+    }
+
+    static void runWorkflow(String workflowName, String branch, List<String> commands) {
         log.info("Running workflow with name [{}]", workflowName);
         processRunner.run(commands);
         try {
-            waitForWorkflowCompletion(workflowName);
+            waitForWorkflowCompletion(workflowName, branch);
         }
         catch (InterruptedException e) {
             throw new IllegalStateException(e);
         }
     }
 
-    private static void waitForWorkflowCompletion(String workflowFile) throws InterruptedException {
+    private static void waitForWorkflowCompletion(String workflowFile, String branch) throws InterruptedException {
         log.info("Waiting for workflow [{}] scheduling...", workflowFile);
         Thread.sleep(10_000); // Wait for the action to schedule
         log.info("Waiting for workflow [{}] completion...", workflowFile);
         boolean completed = false;
         int maxAttempts = 30;
         int attempts = 0;
         while (!completed && attempts < maxAttempts) { // 5 minute timeout
-            List<String> status = processRunner.run("gh", "run", "list", "--workflow", workflowFile, "--limit", "1");
+            List<String> status = processRunner.run("gh", "run", "list", "--workflow", workflowFile, "--branch", branch,
+                    "--limit", "1");
             log.info("Workflow [{}] not completed yet - attempt [{}]/[{}]", workflowFile, attempts + 1, maxAttempts);
             completed = status.stream().anyMatch(line -> line.contains("completed"));
             if (!completed) {