From 6d70b59a5a373e9cbbae031cbd96918b66806f56 Mon Sep 17 00:00:00 2001
From: "vishal.s.patel" <vpatel@gitlab.com>
Date: Tue, 5 Sep 2023 14:37:31 +1200
Subject: [PATCH 1/2] Adding allure report job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c2802c01a..94f120df6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,7 @@ variables:
         backups:
           cron:
             enabled: true
+  GITLAB_AUTH_TOKEN: $DANGER_GITLAB_API_TOKEN
 
 stages:
   - prepare
@@ -74,6 +75,7 @@ stages:
   - specs
   - qa-manual
   - qa
+  - qa-report
   - staging-release
   - package
   - release-package
@@ -89,6 +91,8 @@ include:
   - project: 'gitlab-org/quality/pipeline-common'
     file:
       - '/ci/danger-review.yml'
+      - /ci/base.gitlab-ci.yml
+      - /ci/allure-report.yml
     rules:
       - if: $CI_SERVER_HOST == "gitlab.com"
 
@@ -751,6 +755,7 @@ production_specs_eks:
   services:
   - docker:dind
   variables:
+    QA_GENERATE_ALLURE_REPORT: "true"
     DOCKER_HOST: tcp://docker:2375
     QA_ARTIFACTS_DIR: $CI_PROJECT_DIR
     QA_CAN_TEST_PRAEFECT: "false"
@@ -1064,3 +1069,22 @@ issue-bot:
       when: on_failure
     - if: '$PIPELINE_TYPE =~ /RELEASE_PIPELINE$/'
       when: on_failure
+
+# QA job to post allure report snapshot as a comment in the MR
+.e2e-test-report:
+  extends:
+    - .generate-allure-report-base
+  variables:
+    GITLAB_AUTH_TOKEN: $DANGER_GITLAB_API_TOKEN
+    ALLURE_PROJECT_PATH: $CI_PROJECT_PATH
+    ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
+
+e2e-test-report:
+  extends:
+    - .e2e-test-report
+  stage: qa-report
+  variables:
+    ALLURE_RESULTS_GLOB: "gitlab-qa-run-*/**/allure-results"
+    ALLURE_JOB_NAME: $QA_RUN_TYPE
+  rules:
+    - when: always
\ No newline at end of file
-- 
GitLab


From cdf3b37f217a86ab989f77bb78d9dc8f2ccf3517 Mon Sep 17 00:00:00 2001
From: "vishal.s.patel" <vpatel@gitlab.com>
Date: Mon, 11 Sep 2023 15:02:50 +1200
Subject: [PATCH 2/2] Adding a rule for MR pipeline

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94f120df6b..7a695833af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1087,4 +1087,4 @@ e2e-test-report:
     ALLURE_RESULTS_GLOB: "gitlab-qa-run-*/**/allure-results"
     ALLURE_JOB_NAME: $QA_RUN_TYPE
   rules:
-    - when: always
\ No newline at end of file
+    - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
\ No newline at end of file
-- 
GitLab