From 761ff1f859a4b08bf245d0be3d00d4c44ecba46d Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 7 Feb 2017 22:20:36 +0100 Subject: Add info about the new location of Integrations [ci skip] --- doc/user/project/integrations/bamboo.md | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'doc/user/project/integrations/bamboo.md') diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md index 51668128c62..cad4757f287 100644 --- a/doc/user/project/integrations/bamboo.md +++ b/doc/user/project/integrations/bamboo.md @@ -12,49 +12,48 @@ need to be configured in a Bamboo build plan before GitLab can integrate. ## Setup -### Complete these steps in Bamboo: +### Complete these steps in Bamboo 1. Navigate to a Bamboo build plan and choose 'Configure plan' from the 'Actions' -dropdown. + dropdown. 1. Select the 'Triggers' tab. 1. Click 'Add trigger'. 1. Enter a description such as 'GitLab trigger' 1. Choose 'Repository triggers the build when changes are committed' 1. Check one or more repositories checkboxes -1. Enter the GitLab IP address in the 'Trigger IP addresses' box. This is a -whitelist of IP addresses that are allowed to trigger Bamboo builds. +1. Enter the GitLab IP address in the 'Trigger IP addresses' box. This is a + whitelist of IP addresses that are allowed to trigger Bamboo builds. 1. Save the trigger. -1. In the left pane, select a build stage. If you have multiple build stages -you want to select the last stage that contains the git checkout task. +1. In the left pane, select a build stage. If you have multiple build stages + you want to select the last stage that contains the git checkout task. 1. Select the 'Miscellaneous' tab. -1. Under 'Pattern Match Labelling' put '${bamboo.repository.revision.number}' -in the 'Labels' box. +1. Under 'Pattern Match Labelling' put '${bamboo.repository.revision.number}' + in the 'Labels' box. 1. Save Bamboo is now ready to accept triggers from GitLab. Next, set up the Bamboo -service in GitLab +service in GitLab. -### Complete these steps in GitLab: +### Complete these steps in GitLab 1. Navigate to the project you want to configure to trigger builds. -1. Select 'Settings' in the top navigation. -1. Select 'Services' in the left navigation. +1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services) 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. 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. +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. 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. 1. Save or optionally click 'Test Settings'. Please note that 'Test Settings' -will actually trigger a build in Bamboo. + will actually trigger a build in Bamboo. ## Troubleshooting If builds are not triggered, these are a couple of things to keep in mind. 1. Ensure you entered the right GitLab IP address in Bamboo under 'Trigger -IP addresses'. + IP addresses'. 1. Remember that GitLab only triggers builds on push events. A commit via the -web interface will not trigger CI currently. + web interface will not trigger CI currently. -- cgit v1.2.3