[BUGFIX] bamboo: Label parsing 76/54776/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Mon, 27 Nov 2017 09:23:05 +0000 (10:23 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 27 Nov 2017 10:30:30 +0000 (11:30 +0100)
The bamboo test setup relies on a funny solution to determine the
gerrit patch id and patch set, used for reporting results back
to gerrit.

The regex based solution started behaving weird with latest
bamboo versions and is now quoted slightly differently to fix that.

Special thanks to atlassian support for being friendly, helpful,
quick and providing a working solution to our issue.

Change-Id: I51ec85be2133033777fac8ff1f12071a81c71efc
Resolves: #83107
Releases: master, 8.7, 7.6
Reviewed-on: https://review.typo3.org/54776
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/bamboo/pom.xml
Build/bamboo/src/main/java/core/PreMergeSpec.java

index 30c3f14..8a8e054 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>6.1.0</version>
+    <version>6.2.2</version>
     <relativePath/>
   </parent>
 
index 31c9ab5..819ecd2 100644 (file)
@@ -162,7 +162,7 @@ public class PreMergeSpec extends AbstractCoreSpec {
                     .put("custom", new MapBuilder()
                         .put("auto", new MapBuilder()
                             .put("regex", "https:\\/\\/review\\.typo3\\.org\\/(#\\/c\\/)?(\\d+)")
-                            .put("label", "change-\\2, patchset-${bamboo.patchset}")
+                            .put("label", "change-\\2\\, patchset-${bamboo.patchset}")
                             .build()
                         )
                         .put("buildHangingConfig.enabled", "false")