Skip to content

Commit

Permalink
[TASK] Simplify bamboo variable to label handling
Browse files Browse the repository at this point in the history
Intercept has been adapted, the variable to label handing
can be simplified a bit.

Resolves: #87109
Releases: master, 8.7, 7.6
Change-Id: I27255ef9f5eb515c89f5d89e7061fc473e2abec1
Reviewed-on: https://review.typo3.org/59064
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>
  • Loading branch information
lolli42 authored and maddy2101 committed Dec 8, 2018
1 parent 43693bc commit 3913cd2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Build/bamboo/src/main/java/core/PreMergeSpec.java
Expand Up @@ -168,8 +168,7 @@ protected Job getJobBuildLabels() {
.put("repositoryDefiningWorkingDirectory", -1)
.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-${bamboo.changeUrl}, patchset-${bamboo.patchset}")
.build()
)
.put("buildHangingConfig.enabled", "false")
Expand Down

0 comments on commit 3913cd2

Please sign in to comment.