summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-07-02 13:25:52 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-07-02 13:25:52 +0000
commit6151e46fccac802b8db0af03ffe3f14ef7665518 (patch)
tree264957ade56df1b0a24e0614238ecba7bd468eb7
parent5ab59c82c57a39a4ca476b2a5338ac5a30ac2644 (diff)
parent8c608dad37f52fb30f2a95a22f8f00c82a90550a (diff)
downloadgitlab-ce-6151e46fccac802b8db0af03ffe3f14ef7665518.tar.gz
Merge branch 'crose-details-on-buildkey' into 'master'
Add detail around 'Build Key' within the GitLab steps. See merge request gitlab-org/gitlab-ce!20219
-rw-r--r--doc/user/project/integrations/bamboo.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index 1e28646bc97..cffe456cbc2 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -41,8 +41,7 @@ service in GitLab.
1. Click 'Atlassian Bamboo CI'
1. Select the 'Active' checkbox.
1. Enter the base URL of your Bamboo server. 'https://bamboo.example.com'
-1. Enter the build key from your Bamboo build plan. Build keys are a short,
- all capital letter, identifier that is unique. It will be something like PR-BLD
+1. Enter the build key from your Bamboo build plan. Build keys are typically made up from the Project Key and Plan Key that are set on project/plan creation and seperated with a '-' for example **PROJ-PLAN**. This is a short, all capital letter, identifier that is unique. When viewing a plan within Bamboo, the build key is also shown in the browser URL for example https://bamboo.example.com/browse/PROJ-PLAN
1. If necessary, enter username and password for a Bamboo user that has
access to trigger the build plan. Leave these fields blank if you do not require
authentication.