diff options
| author | Maxim Epishchev <epishev@garant.ru> | 2016-01-21 19:52:23 +0300 |
|---|---|---|
| committer | Maxim Epishchev <epishev@garant.ru> | 2016-01-21 20:01:44 +0300 |
| commit | 91a85604177f7df2eb204c9e82564142dbe328f8 (patch) | |
| tree | b950cc3f5b150005243dd2ed260add5da070d344 /src/main/resources/bitbucketpullrequestbuilder | |
| parent | 31b3fbaa1926c751b651d58044a5216b64566029 (diff) | |
| download | bbprb-91a85604177f7df2eb204c9e82564142dbe328f8.tar.gz | |
Refactoring filters code and add tests
Now we can using more complex filters with source/destination filtration. Also add experimental integration with Git SCM plugin.
Diffstat (limited to 'src/main/resources/bitbucketpullrequestbuilder')
3 files changed, 13 insertions, 0 deletions
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly index 845926d..25acac0 100644 --- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly +++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly @@ -17,6 +17,9 @@ <f:entry title="BranchesFilter" field="branchesFilter"> <f:textbox /> </f:entry> + <f:entry title="Using Git SCM 'Branches to build' option to filter pull requests?" field="branchesFilterBySCMIncludes"> + <f:checkbox /> + </f:entry> <f:entry title="CI Identifier" field="ciKey"> <f:textbox default="jenkins" /> </f:entry> diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html index f49da40..88af799 100644 --- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html +++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html @@ -3,3 +3,10 @@ Available formats: * any pull requests applied for this project: "any", "*" or empty string. * filtered by destination branch: "my-branch" or more complex reg-ex filter "r:^master" (must be started with "r:" and case insensitive match). * filtered by source and destination branches: "s:source-branch d:dest-branch" +* filtered by source and destination branches with regex: "s:r:^feature d:r:master$" +* filtered by many destination/source branches: "s:one s:two s:three d:master d:r:master$" +* filtered by many sources branches: "s:one s:two s:r:^three d:" +When you using format with source branch filter "s" or destination filter "d", you must cpecify great than one source and destination filter, eg "s:1 s:2 s:... d:". +Any sources and any destinations for pull request: +* filter string: "*" +* filter string: "s: d:" diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html new file mode 100644 index 0000000..3f24419 --- /dev/null +++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html @@ -0,0 +1,3 @@ +It is sugar-option for synchronize option "BranchesFilter" to Git SCM option "Branches to build" without manual editing. +Check this option suppose than your "BranchesFilter" field has logick equal value with Git SCM "Branches to build" option (original value from "BranchesFilter" field will e ignored). +If "Branches to build" option has values "*/master */feature-master */build-with-jenkins", then "BranchesFilter" field will have value "d:master d:feature-master d:build-with-jenkins". |