From 9caea1e9886102ee9fb03020c40c94b5682422a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 26 Aug 2022 12:07:18 +0200
Subject: [PATCH 1/2] Use the 'danger-review' template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92277aa399..f16b5a0678 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,10 @@ include:
   - template: Security/Secret-Detection.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/SAST-IaC.latest.gitlab-ci.yml
+  - project: 'gitlab-org/quality/pipeline-common'
+    file:
+      - '/ci/danger-review.yml'
+
 dependency_scanning:
   needs: []
   before_script: []
@@ -492,23 +496,7 @@ debug_review:
       - *com_auto_deploy_branch_ref
 
 danger-review:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
   stage: prepare
-  cache: {}
-  only:
-    variables:
-      - $DANGER_GITLAB_API_TOKEN
-  except:
-    <<: *deps_pipeline
-    refs:
-      - master
-      - tags
-      - triggers
-      - *com_auto_deploy_branch_ref
-      - *stable_branch_ref
-  script:
-    - git version
-    - danger --fail-on-errors=true
 
 rubocop:
   image: ruby:2.7.4-alpine
-- 
GitLab


From c94bd774ff885abdbde7bfa2a1de2512ece2f369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 26 Aug 2022 15:08:45 +0000
Subject: [PATCH 2/2] Keep current rule for the `danger-review` job

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f16b5a0678..fcaa1bea03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -497,6 +497,17 @@ debug_review:
 
 danger-review:
   stage: prepare
+  only:
+    variables:
+      - $DANGER_GITLAB_API_TOKEN
+  except:
+    <<: *deps_pipeline
+    refs:
+      - master
+      - tags
+      - triggers
+      - *com_auto_deploy_branch_ref
+      - *stable_branch_ref
 
 rubocop:
   image: ruby:2.7.4-alpine
-- 
GitLab