Add latest changes from gitlab-org/gitlab@master

1 files changed, 59 insertions, 5 deletions

diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index 22e6d45dd96..75f099268cb 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -9,11 +9,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 You can automatically trigger builds in Atlassian Bamboo when you push changes
 to your project in GitLab.
 
-When this integration is configured, merge requests also display the following information:
-
-- A CI/CD status that shows if the build is pending, failed, or has completed successfully.
-- A link to the Bamboo build page for more information.
-
 Bamboo doesn't provide the same features as a traditional build system when
 accepting webhooks and commit data. You must configure a Bamboo
 build plan before you configure the integration in GitLab.
@@ -66,6 +61,65 @@ for example `PROJ-PLAN`.
 The build key is included in the browser URL when you view a plan in
 Bamboo. For example, `https://bamboo.example.com/browse/PROJ-PLAN`.
 
+## Update Bamboo build status in GitLab
+
+You can use a script that uses the [commit status API](../../../api/commits.md#post-the-build-status-to-a-commit)
+and Bamboo build variables to:
+
+- Update the commit with the build status.
+- Add the Bamboo build plan URL as the commit's `target_url`.
+
+For example:
+
+1. Create an [access token](../../../api/index.md#personalprojectgroup-access-tokens) in GitLab with `:api` permissions.
+1. Save the token as a `$GITLAB_TOKEN` variable in Bamboo.
+1. Add the following script as a final task to the Bamboo plan's jobs:
+
+   ```shell
+   #!/bin/bash
+
+   # Script to update CI status on GitLab.
+   # Add this script as final inline script task in a Bamboo job.
+   #
+   # General documentation: https://docs.gitlab.com/ee/user/project/integrations/bamboo.html
+   # Fix inspired from https://gitlab.com/gitlab-org/gitlab/-/issues/34744
+
+   # Stop at first error
+   set -e
+
+   # Access token. Set this as a CI variable in Bamboo.
+   #GITLAB_TOKEN=
+
+   # Status
+   cistatus="failed"
+   if [ "${bamboo_buildFailed}" = "false" ]; then
+     cistatus="success"
+   fi
+
+   repo_url="${bamboo_planRepository_repositoryUrl}"
+
+   # Check if we use SSH or HTTPS
+   protocol=${repo_url::4}
+   if [ "$protocol" == "git@" ]; then
+     repo=${repo_url:${#protocol}};
+     gitlab_url=${repo%%:*};
+   else
+     protocol="https://"
+     repo=${repo_url:${#protocol}};
+     gitlab_url=${repo%%/*};
+   fi
+
+   start=$((${#gitlab_url} + 1)) # +1 for the / (https) or : (ssh)
+   end=$((${#repo} - $start -4)) # -4 for the .git
+   repo=${repo:$start:$end}
+   repo=$(echo "$repo" | sed "s/\//%2F/g")
+
+   # Send request
+   url="https://${gitlab_url}/api/v4/projects/${repo}/statuses/${bamboo_planRepository_revision}?state=${cistatus}&target_url=${bamboo_buildResultsUrl}"
+   echo "Sending request to $url"
+   curl --fail --request POST --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$url"
+   ```
+
 ## Troubleshooting
 
 ### Builds not triggered