aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly48
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html19
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html7
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html5
-rw-r--r--src/main/resources/index.jelly2
-rw-r--r--src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/config.jelly21
-rw-r--r--src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-cancelOutdatedJobs.html (renamed from src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-cancelOutdatedJobs.html)0
-rw-r--r--src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciKey.html (renamed from src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html)0
-rw-r--r--src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciName.html (renamed from src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html)0
9 files changed, 22 insertions, 80 deletions
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
deleted file mode 100644
index 1d7c4e4..0000000
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ /dev/null
@@ -1,48 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
- <f:entry title="Cron" field="cron">
- <f:textbox />
- </f:entry>
- <f:entry title="${%Credentials}" field="credentialsId">
- <c:select/>
- </f:entry>
- <f:entry title="Bitbucket BasicAuth Username" field="username">
- <f:textbox />
- </f:entry>
- <f:entry title="Bitbucket BasicAuth Password" field="password">
- <f:password />
- </f:entry>
- <f:entry title="RepositoryOwner" field="repositoryOwner">
- <f:textbox />
- </f:entry>
- <f:entry title="RepositoryName" field="repositoryName">
- <f:textbox />
- </f:entry>
- <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>
- <f:entry title="CI Name" field="ciName">
- <f:textbox default="Jenkins" />
- </f:entry>
- <f:entry title="CI Skip Phrases" field="ciSkipPhrases">
- <f:textbox />
- </f:entry>
- <f:entry title="Rebuild if destination branch changes?" field="checkDestinationCommit">
- <f:checkbox />
- </f:entry>
- <f:entry title="Approve if build success?" field="approveIfSuccess">
- <f:checkbox />
- </f:entry>
- <f:entry title="Cancel outdated jobs?" field="cancelOutdatedJobs">
- <f:checkbox default="false"/>
- </f:entry>
- <f:entry title="Comment phrase to trigger build" field="commentTrigger">
- <f:textbox default="test this please"/>
- </f:entry>
-</j:jelly>
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html
deleted file mode 100644
index 30e5f5e..0000000
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilter.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
- Filter option in custom format. Default value is empty or <tt>any</tt>.<br/>
- Available formats:
- <ul>
- <li>any pull requests applied for this project: <tt>any</tt>, <tt>*</tt> or empty string</li>
- <li>filtered by destination branch: <tt>my-branch</tt> or more complex reg-ex filter <tt>r:^master</tt> (must be started with <tt>r:</tt> and case insensitive match).</li>
- <li>filtered by source and destination branches: <tt>s:source-branch d:dest-branch</tt></li>
- <li>filtered by source and destination branches with regex: <tt>s:r:^feature d:r:master$</tt></li>
- <li>filtered by many destination/source branches: <tt>s:one s:two s:three d:master d:r:master$</tt></li>
- <li>filtered by many sources branches: <tt>s:one s:two s:r:^three d:</tt></li>
- </ul>
- <p/>
- When you using format with source branch filter <tt>s</tt> or destination filter <tt>d</tt>, you must specify great than one source and destination filter, eg <tt>s:1 s:2 s:... d:</tt>.<br/>
- Any sources and any destinations for pull request:
- <ul>
- <li>filter string: <tt>*</tt></li>
- <li>filter string: <tt>s: d:</tt></li>
- </ul>
-</div>
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html
deleted file mode 100644
index cc9d47c..0000000
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-branchesFilterBySCMIncludes.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Uses the Git SCM option "Branches to build" option as the value for
-"BranchesFilter". If the "BranchesFilter" field itself has any content,
-it will be ignored.
-<br>
-If the "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".
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html
deleted file mode 100644
index f30f306..0000000
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciSkipPhrases.html
+++ /dev/null
@@ -1,5 +0,0 @@
-A comma-separated list of strings to search the pull request title for.
-<br>
-e.g. If set to "trivial,[skiptest]", any PRs containing either "trivial" or
-"[skiptest]" (case-insensitive) will not be built.
-
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
index 372d9f8..b295683 100644
--- a/src/main/resources/index.jelly
+++ b/src/main/resources/index.jelly
@@ -3,5 +3,5 @@
This view is used to render the installed plugins page.
-->
<div>
- This plugin polls BitBucket to determine whether there are Pull Requests that should be built.
+ This plugin build Bitbucket pull requests via web-hooks
</div>
diff --git a/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/config.jelly b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/config.jelly
new file mode 100644
index 0000000..f61601a
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/config.jelly
@@ -0,0 +1,21 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
+ <f:entry title="${%Credentials}" field="credentialsId">
+ <c:select/>
+ </f:entry>
+ <f:entry title="Repository" field="destinationRepository">
+ <f:textbox />
+ </f:entry>
+ <f:entry title="CI Identifier" field="ciKey">
+ <f:textbox default="jenkins" />
+ </f:entry>
+ <f:entry title="CI Name" field="ciName">
+ <f:textbox default="Jenkins" />
+ </f:entry>
+ <f:entry title="Rebuild if destination branch changes" field="checkDestinationCommit">
+ <f:checkbox default="false"/>
+ </f:entry>
+ <f:entry title="Cancel outdated jobs" field="cancelOutdatedJobs">
+ <f:checkbox default="false"/>
+ </f:entry>
+</j:jelly>
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-cancelOutdatedJobs.html b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-cancelOutdatedJobs.html
index c03651c..c03651c 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-cancelOutdatedJobs.html
+++ b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-cancelOutdatedJobs.html
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciKey.html
index 97696b6..97696b6 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html
+++ b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciKey.html
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciName.html
index 32f248d..32f248d 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html
+++ b/src/main/resources/org/jenkinsci/plugins/bbprb/BitbucketBuildTrigger/help-ciName.html