From e85c45e9a43aeb078a7c9dcc9523508e03ba29bd Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@orange.com>
Date: Tue, 15 Jun 2021 17:01:32 +0200
Subject: [PATCH] fix: autodetect MR when a milestone is here
---
templates/gitlab-ci-sonar.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml
index 70acee7..4ef333f 100644
--- a/templates/gitlab-ci-sonar.yml
+++ b/templates/gitlab-ci-sonar.yml
@@ -135,9 +135,9 @@ stages:
wget -q "$CI_API_V4_URL/projects/${CI_PROJECT_ID}/merge_requests?state=opened&source_branch=${CI_COMMIT_REF_NAME}&private_token=$SONAR_GITLAB_TOKEN" -O mr.json || log_warn "Failed requesting GitLab API: check \$SONAR_GITLAB_TOKEN"
if [[ -f mr.json ]] && [[ "$(cat mr.json)" != "[]" ]]
then
- mr_title=$(sed -E 's/.*"title":"([^"]*)".*/\1/g' < mr.json)
- mr_target=$(sed -E 's/.*"target_branch":"([^"]*)".*/\1/g' < mr.json)
- mr_id=$(sed -E 's/.*"iid":([0-9]+).*/\1/g' < mr.json)
+ mr_title=$(sed -E 's/\[\{[^{]*"title":"([^"]*)".*/\1/g' < mr.json)
+ mr_target=$(sed -E 's/\[\{[^{]*"target_branch":"([^"]*)".*/\1/g' < mr.json)
+ mr_id=$(sed -E 's/\[\{[^{]*"iid":([0-9]+).*/\1/g' < mr.json)
log_info "Merge Request \\e[33;1m$mr_title\\e[0m detected associated to this branch: trigger MR analysis..."
export sonar_mr_args="-Dsonar.pullrequest.key=$mr_id -Dsonar.pullrequest.branch=${CI_COMMIT_REF_NAME} -Dsonar.pullrequest.base=$mr_target"
else
--
GitLab