aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/bitbucketpullrequestbuilder
diff options
context:
space:
mode:
authorJoel Baranick <joel.baranick@ensighten.com>2015-12-17 08:50:45 -0800
committerJoel Baranick <joel.baranick@ensighten.com>2015-12-17 08:50:45 -0800
commitf0588fb15ee687619695bccfc7553dbcd43b948d (patch)
tree54cf3ba9d17db5de413553d238949cc0db286954 /src/main/resources/bitbucketpullrequestbuilder
parentf2294ad4c37592d4046fd02e35439340278b09a0 (diff)
parent810d15cd76fe5869730ab6610de457ae52a6433e (diff)
downloadbbprb-f0588fb15ee687619695bccfc7553dbcd43b948d.tar.gz
Merge branch 'master_k' into CredentialsSupport
# Conflicts: # src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
Diffstat (limited to 'src/main/resources/bitbucketpullrequestbuilder')
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly6
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html4
-rw-r--r--src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html1
3 files changed, 11 insertions, 0 deletions
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
index db5ca0f..b324049 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
@@ -17,6 +17,12 @@
<f:entry title="RepositoryName" field="repositoryName">
<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="CI Skip Phrases" field="ciSkipPhrases">
<f:textbox />
</f:entry>
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html
new file mode 100644
index 0000000..97696b6
--- /dev/null
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciKey.html
@@ -0,0 +1,4 @@
+The identifier needs to be unique among your Jenkins jobs related to this repo.
+This identifier is used to decide whether a commit is already built by this job and to set status for a newly built commit.
+If the value is changed rebuilds may occur and multiple statuses might show on an existing pull request.
+The value is not shown for end users of Bitbucket.
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html
new file mode 100644
index 0000000..32f248d
--- /dev/null
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/help-ciName.html
@@ -0,0 +1 @@
+This value is the name of the current job when showing build statuses for a pull request.