Fixing meta release

Author: marcingrzejszczak

src/main/java/io/micrometer/release/Main.java

@@ -113,15 +113,19 @@ MetaTrainReleaseWorkflow metaReleaseWorkflow(PostReleaseWorkflow postReleaseWork
 
     private List<ProjectSetup> parseMetaTrainOptions(boolean testMode, String contextPropVersions,
             String micrometerVersions, String tracingVersions, String docsGenVersions) {
-        return TrainOptions.withTestMode(testMode)
+        List<ProjectSetup> projectSetups = TrainOptions.withTestMode(testMode)
             .parseForMetaTrain(contextPropVersions, micrometerVersions, tracingVersions, docsGenVersions);
+        log.info("Parsed options for meta-release {}", projectSetups);
+        return projectSetups;
     }
 
     private ProjectSetup parseTrainOptions(boolean testMode, String githubOrgRepo, String contextPropVersions,
             String micrometerVersions, String tracingVersions, String docsGenVersions) {
-        return TrainOptions.withTestMode(testMode)
+        ProjectSetup setup = TrainOptions.withTestMode(testMode)
             .parseForSingleProjectTrain(githubOrgRepo, contextPropVersions, micrometerVersions, tracingVersions,
                     docsGenVersions);
+        log.info("Parsed options for meta-release [{}]", setup);
+        return setup;
     }
 
     private boolean isMetaRelease(String githubOrgRepo, String contextPropVersions, String micrometerVersions,
@@ -135,7 +139,7 @@ private boolean isTrainRelease(String githubOrgRepo, String contextPropVersions,
         return switch (githubOrgRepo) {
             case "micrometer-metrics/context-propagation" -> hasText(contextPropVersions);
             case "micrometer-metrics/micrometer", "marcingrzejszczak/gh-actions-test" -> hasText(micrometerVersions);
-            case "micrometer-metrics/tracing" -> hasText(tracingVersions);
+            case "micrometer-metrics/tracing", "marcingrzejszczak/gh-actions-test2" -> hasText(tracingVersions);
             case "micrometer-metrics/micrometer-docs-generator" -> hasText(docsGenVersions);
             default -> false;
         };

src/main/java/io/micrometer/release/meta/MetaTrainReleaseWorkflow.java

@@ -49,7 +49,9 @@ public void run(List<ProjectSetup> projectSetups) {
 
     private ProjectTrainReleaseWorkflow newProjectTrainReleaseWorkflow(ProjectSetup projectSetup) {
         File projectSubfolder = new File(projectSetup.ghRepo());
-        log.info("Creating a subfolder [{}] for project [{}]", projectSubfolder, projectSetup.ghOrgRepo());
+        projectSubfolder.mkdirs();
+        log.info("Setting a working dir [{}] for project [{}]", projectSubfolder.getAbsolutePath(),
+                projectSetup.ghOrgRepo());
         return workflow(projectSetup, projectSubfolder);
     }
 

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

@@ -36,11 +36,9 @@ void changeTag(String tag) {
     }
 
     File cloneRepo(String branch, String orgRepository) {
-        // micrometer-metrics/micrometer -> micrometer-metrics_micrometer
-        String folderToCloneTo = orgRepository.replace("/", "_");
-        log.info("Cloning out {} branch to folder {}", branch, folderToCloneTo);
-        processRunner.run("gh", "repo", "clone", orgRepository, folderToCloneTo, "--", "-b", branch, "--single-branch");
-        return clonedDir(folderToCloneTo);
+        log.info("Cloning out {} branch to folder {}", branch, branch);
+        processRunner.run("gh", "repo", "clone", orgRepository, branch, "--", "-b", branch, "--single-branch");
+        return clonedDir(branch);
     }
 
     File clonedDir(String subfolder) {

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

@@ -45,8 +45,12 @@ public List<ProjectSetup> parseForMetaTrain(String contextPropagationVersions, S
         List<ProjectWithDependencies> projects = projectWithDependencies(splitProjects);
         Map<ProjectDefinition, List<ProjectWithDependencies>> perProject = projects.stream()
             .collect(Collectors.groupingBy(p -> p.project.projectDefinition));
-        return perProject.entrySet()
-            .stream()
+        return perProject.entrySet().stream().filter(e -> {
+            if (testMode) {
+                return e.getKey() == ProjectDefinition.TEST || e.getKey() == ProjectDefinition.TRACING_TEST;
+            }
+            return true;
+        })
             .map(e -> new ProjectSetup(e.getValue(), e.getKey().orgRepo))
             .sorted(Comparator.comparingInt(o -> o.thisProject.get(0).project.projectDefinition.ordinal())) // ORDER
                                                                                                             // MATTERS!!!!
@@ -346,7 +350,8 @@ public GhActionsTest(Micrometer micrometer) {
     static class GhActionsTracingTest extends ProjectWithDependencies {
 
         public GhActionsTracingTest(Tracing tracing) {
-            super(new Project(ProjectDefinition.TEST, tracing.getProject().projectVersion), tracing.getDependencies());
+            super(new Project(ProjectDefinition.TRACING_TEST, tracing.getProject().projectVersion),
+                    tracing.getDependencies());
         }
 
     }

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

@@ -40,8 +40,7 @@ void should_clone_a_repo() {
         git.cloneRepo("foo", "micrometer-metrics/micrometer");
 
         then(processRunner).should()
-            .run("gh", "repo", "clone", "micrometer-metrics/micrometer", "micrometer-metrics_micrometer", "--", "-b",
-                    "foo", "--single-branch");
+            .run("gh", "repo", "clone", "micrometer-metrics/micrometer", "foo", "--", "-b", "foo", "--single-branch");
     }
 
 }

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

@@ -138,10 +138,25 @@ void should_parse_for_meta_train_entries_to_project_setup(String contextPropagat
         then(projectSetups).isEqualTo(expectedResult);
     }
 
+    @Test
+    void should_parse_for_meta_train_entries_to_project_setup_for_test_project() {
+        String contextPropagationVersions = "";
+        String micrometerVersions = "1.1.0";
+        String tracingVersions = "2.0.0";
+        String docsGenVersions = "";
+
+        List<ProjectSetup> projectSetups = TrainOptions.withTestMode(true)
+            .parseForMetaTrain(contextPropagationVersions, micrometerVersions, tracingVersions, docsGenVersions);
+
+        then(projectSetups).hasSize(2);
+        then(projectSetups.get(0).ghRepo()).isEqualTo("gh-actions-test");
+        then(projectSetups.get(1).ghRepo()).isEqualTo("gh-actions-test2");
+    }
+
     static Stream<Arguments> should_parse_for_meta_train_entries_to_project_setup_args() {
         return Stream.of(
-                // Arguments.of("1.0.0,1.1.0,1.1.1", "", "", "",
-                // List.of(singleContextPropagation("micrometer-metrics/context-propagation"))),
+                Arguments.of("1.0.0,1.1.0,1.1.1", "", "", "",
+                        List.of(singleContextPropagation("micrometer-metrics/context-propagation"))),
                 Arguments.of("1.0.0,1.1.0,1.1.1", "1.14.0,1.15.0,1.16.0", "", "",
                         List.of(contextAndMicrometer("micrometer-metrics/context-propagation"),
                                 contextAndMicrometer("micrometer-metrics/micrometer"))),