Skip to content
Permalink
Browse files

Merge remote-tracking branch 'isugimpy/JENKINS-41789'

  • Loading branch information
daspilker committed Feb 9, 2017
2 parents 9fdd856 + ad16ac3 commit b28e859123c0a6acc6c745ea35a46f2af26405b2
@@ -36,7 +36,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
[JENKINS-39754](https://issues.jenkins-ci.org/browse/JENKINS-39754),
[JENKINS-40719](https://issues.jenkins-ci.org/browse/JENKINS-40719))
* Enhanced support for the [GitLab Plugin](https://wiki.jenkins-ci.org/display/JENKINS/GitLab+Plugin)
([JENKINS-41485](https://issues.jenkins-ci.org/browse/JENKINS-41485))
([JENKINS-41485](https://issues.jenkins-ci.org/browse/JENKINS-41485),
[JENKINS-41789](https://issues.jenkins-ci.org/browse/JENKINS-41789))
* Fixed a problem with the plugin's dependencies
([JENKINS-41001](https://issues.jenkins-ci.org/browse/JENKINS-41001))
* Fixed a problem with Windows paths on Unix
@@ -13,7 +13,7 @@ class GitLabTriggerContext extends AbstractContext {
String excludeBranches
String targetBranchRegex
String rebuildOpenMergeRequest = 'never'
String branchFilterType = 'all'
String branchFilterType = 'All'
boolean buildOnMergeRequestEvents = true
boolean buildOnPushEvents = true
boolean enableCiSkip = true
@@ -34,15 +34,15 @@ class GitLabTriggerContext extends AbstractContext {
*/
void includeBranches(String includeBranches) {
this.includeBranches = includeBranches
this.branchFilterType = 'nameBasedFilter'
this.branchFilterType = 'NameBasedFilter'
}

/**
* Comma-separated list of source branches disabled to trigger a build from a push event.
*/
void excludeBranches(String excludeBranches) {
this.excludeBranches = excludeBranches
this.branchFilterType = 'nameBasedFilter'
this.branchFilterType = 'NameBasedFilter'
}

/**
@@ -54,7 +54,7 @@ class GitLabTriggerContext extends AbstractContext {
*/
void targetBranchRegex(String targetBranchRegex) {
this.targetBranchRegex = targetBranchRegex
this.branchFilterType = 'regexBasedFilter'
this.branchFilterType = 'RegexBasedFilter'
}

/**
@@ -372,7 +372,7 @@ class TriggerContextSpec extends Specification {
addNoteOnMergeRequest[0].value() == true
addCiMessage[0].value() == false
addVoteOnMergeRequest[0].value() == true
branchFilterType[0].value() == 'all'
branchFilterType[0].value() == 'All'
includeBranchesSpec[0].value().empty
excludeBranchesSpec[0].value().empty
targetBranchRegex[0].value().empty
@@ -403,7 +403,7 @@ class TriggerContextSpec extends Specification {
addNoteOnMergeRequest[0].value() == true
addCiMessage[0].value() == false
addVoteOnMergeRequest[0].value() == true
branchFilterType[0].value() == 'all'
branchFilterType[0].value() == 'All'
includeBranchesSpec[0].value().empty
excludeBranchesSpec[0].value().empty
targetBranchRegex[0].value().empty
@@ -445,7 +445,7 @@ class TriggerContextSpec extends Specification {
addNoteOnMergeRequest[0].value() == value
addCiMessage[0].value() == value
addVoteOnMergeRequest[0].value() == value
branchFilterType[0].value() == 'nameBasedFilter'
branchFilterType[0].value() == 'NameBasedFilter'
includeBranchesSpec[0].value() == 'include1,include2'
excludeBranchesSpec[0].value() == 'exclude1,exclude2'
targetBranchRegex[0].value().empty
@@ -493,7 +493,7 @@ class TriggerContextSpec extends Specification {
addNoteOnMergeRequest[0].value() == value
addCiMessage[0].value() == value
addVoteOnMergeRequest[0].value() == value
branchFilterType[0].value() == 'nameBasedFilter'
branchFilterType[0].value() == 'NameBasedFilter'
includeBranchesSpec[0].value() == 'include1,include2'
excludeBranchesSpec[0].value() == 'exclude1,exclude2'
targetBranchRegex[0].value().empty
@@ -538,7 +538,7 @@ class TriggerContextSpec extends Specification {
addNoteOnMergeRequest[0].value() == value
addCiMessage[0].value() == value
addVoteOnMergeRequest[0].value() == value
branchFilterType[0].value() == 'regexBasedFilter'
branchFilterType[0].value() == 'RegexBasedFilter'
includeBranchesSpec[0].value().empty
excludeBranchesSpec[0].value().empty
targetBranchRegex[0].value() == '(.*debug.*|.*release.*)'

0 comments on commit b28e859

Please sign in to comment.
You can’t perform that action at this time.