[TASK] bamboo 8.7 nightly supports paches on-top 67/59067/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Sat, 8 Dec 2018 17:52:22 +0000 (18:52 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 8 Dec 2018 18:54:45 +0000 (19:54 +0100)
Change-Id: I1830314fa79a218429f6210d7bc12a17a51daa8a
Resolves: #87110
Releases: 8.7
Reviewed-on: https://review.typo3.org/59067
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Build/bamboo/src/main/java/core/AbstractCoreSpec.java
Build/bamboo/src/main/java/core/NightlySpec.java
Build/bamboo/src/main/java/core/PreMergeSpec.java

index a8b0f4e..0d69ba6 100644 (file)
@@ -142,6 +142,44 @@ abstract public class AbstractCoreSpec {
     }
 
     /**
+     * Job creating labels needed for intercept communication
+     */
+    protected Job getJobBuildLabels() {
+        return new Job("Create build labels", new BambooKey("CLFB"))
+            .description("Create changeId and patch set labels from variable access and parsing result of a dummy task")
+            .pluginConfigurations(new AllOtherPluginsConfiguration()
+                .configuration(new MapBuilder()
+                    .put("repositoryDefiningWorkingDirectory", -1)
+                    .put("custom", new MapBuilder()
+                        .put("auto", new MapBuilder()
+                            .put("label", "change-${bamboo.changeUrl}, patchset-${bamboo.patchset}")
+                            .build()
+                        )
+                        .put("buildHangingConfig.enabled", "false")
+                        .put("ncover.path", "")
+                        .put("clover", new MapBuilder()
+                            .put("path", "")
+                            .put("license", "")
+                            .put("useLocalLicenseKey", "true")
+                            .build()
+                        )
+                        .build()
+                    )
+                    .build()
+                )
+            )
+            .tasks(
+                new ScriptTask()
+                    .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
+                    .inlineBody("echo \"I'm just here for the labels!\"")
+            )
+            .requirements(
+                this.getRequirementDocker10()
+            )
+            .cleanWorkingDirectory(true);
+    }
+
+    /**
      * Job composer validate
      *
      * @param String requirementIdentifier
index a863291..10f3a0a 100644 (file)
@@ -65,6 +65,13 @@ public class NightlySpec extends AbstractCoreSpec {
      * Returns full Plan definition
      */
     Plan createPlan() {
+        // PREPARATION stage
+        ArrayList<Job> jobsPreparationStage = new ArrayList<Job>();
+        jobsPreparationStage.add(this.getJobBuildLabels());
+        Stage stagePreparation = new Stage("Preparation")
+            .jobs(jobsPreparationStage.toArray(new Job[jobsPreparationStage.size()]));
+
+
         // MAIN stage
         ArrayList<Job> jobsMainStage = new ArrayList<Job>();
 
@@ -127,6 +134,7 @@ public class NightlySpec extends AbstractCoreSpec {
             .description("Execute TYPO3 core 8.7 nightly tests. Auto generated! See Build/bamboo of core git repository.")
             .pluginConfigurations(this.getDefaultPlanPluginConfiguration())
             .stages(
+                stagePreparation,
                 stageMainStage
             )
             .linkedRepositories("github TYPO3 TYPO3.CMS 8.7")
index 6b4800a..50548eb 100644 (file)
@@ -158,44 +158,6 @@ public class PreMergeSpec extends AbstractCoreSpec {
     }
 
     /**
-     * Job creating labels needed for intercept communication
-     */
-    protected Job getJobBuildLabels() {
-        return new Job("Create build labels", new BambooKey("CLFB"))
-            .description("Create changeId and patch set labels from variable access and parsing result of a dummy task")
-            .pluginConfigurations(new AllOtherPluginsConfiguration()
-                .configuration(new MapBuilder()
-                    .put("repositoryDefiningWorkingDirectory", -1)
-                    .put("custom", new MapBuilder()
-                        .put("auto", new MapBuilder()
-                            .put("label", "change-${bamboo.changeUrl}, patchset-${bamboo.patchset}")
-                            .build()
-                        )
-                        .put("buildHangingConfig.enabled", "false")
-                        .put("ncover.path", "")
-                        .put("clover", new MapBuilder()
-                            .put("path", "")
-                            .put("license", "")
-                            .put("useLocalLicenseKey", "true")
-                            .build()
-                        )
-                        .build()
-                    )
-                    .build()
-                )
-            )
-            .tasks(
-                new ScriptTask()
-                    .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
-                    .inlineBody("echo \"I'm just here for the labels!\"")
-            )
-            .requirements(
-                this.getRequirementDocker10()
-            )
-            .cleanWorkingDirectory(true);
-    }
-
-    /**
      * Job checking CGL of last git commit
      *
      * @param String requirementIdentifier