From d61418197586dd0f0859c2e120c30807a8fa9068 Mon Sep 17 00:00:00 2001 From: Lex Brugman Date: Sun, 28 Dec 2014 19:20:13 +0100 Subject: [PATCH] Make the view regex a bit more restrictive to prevent collissions --- src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy b/src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy index 8d451fc5..e931df63 100644 --- a/src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy +++ b/src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy @@ -108,7 +108,7 @@ class JenkinsApi { println "creating view - viewName:${viewName}, nestedView:${nestedWithinView}" post(buildViewPath("createView", nestedWithinView), body) - String regex = viewRegex ? viewRegex.replaceAll("master", branchView.safeBranchName) : "${branchView.templateJobPrefix}.*${branchView.safeBranchName}" + String regex = viewRegex ? viewRegex.replaceAll("master", branchView.safeBranchName) : "${branchView.templateJobPrefix}-[a-zA-Z0-9]*-${branchView.safeBranchName}" body = [useincluderegex: 'on', includeRegex: regex, name: viewName, json: '{"name": "' + viewName + '","useincluderegex": {"includeRegex": "' + regex + '"},' + VIEW_COLUMNS_JSON + '}'] println "configuring view ${viewName}" post(buildViewPath("configSubmit", nestedWithinView, viewName), body)