Do not delete branches that are not created by jenkins-build-per-branch

elevennl · Jun 25, 2015 · c4ab73f · c4ab73f
1 parent 2106c2a
commit c4ab73f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/groovy/com/entagen/jenkins/JenkinsJobManager.groovy b/src/main/groovy/com/entagen/jenkins/JenkinsJobManager.groovy
@@ -77,8 +77,10 @@ class JenkinsJobManager {
         deprecatedJobNames.each { String jobName ->
 
             def shortenedJobName = jobName.substring(templateJobPrefix.length() + 1)
+            def safeBranchNameRegex = branchNameRegex.replaceAll("\\/", _)
             println "Shortened jobName $shortenedJobName"
-            final def branchNameRegexMatches = shortenedJobName.matches(branchNameRegex)
+            println "safeBranchNameRegex $safeBranchNameRegex"
+            final def branchNameRegexMatches = shortenedJobName.matches(safeBranchNameRegex)
             if (!noDelete && branchNameRegexMatches) {
                 println "Deleting deprecated job: $jobName"
                 jenkinsApi.deleteJob(jobName)