1 files changed, 22 insertions, 40 deletions
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
index a955096992f..d2192a7511a 100644
--- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
@@ -1,3 +1,10 @@
+include:
+  - project: gitlab-org/quality/pipeline-common
+    ref: 0.3.6
+    file:
+      - /ci/allure-report.yml
+      - /ci/knapsack-report.yml
+
 .review-qa-base:
   extends:
     - .use-docker-in-docker
@@ -43,27 +50,13 @@
     when: always
 
 .allure-report-base:
-  image:
-    name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.2
-    entrypoint: [""]
+  extends: .generate-allure-report-base
   stage: post-qa
   variables:
-    GIT_STRATEGY: none
-    STORAGE_CREDENTIALS: $QA_ALLURE_REPORT_GCS_CREDENTIALS
     GITLAB_AUTH_TOKEN: $GITLAB_QA_MR_ALLURE_REPORT_TOKEN
     ALLURE_PROJECT_PATH: $CI_PROJECT_PATH
     ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
-  allow_failure: true
-  script:
-    - |
-      allure-report-publisher upload gcs \
-        --results-glob="qa/tmp/allure-results/*" \
-        --bucket="gitlab-qa-allure-reports" \
-        --prefix="$ALLURE_REPORT_PATH_PREFIX/$CI_COMMIT_REF_SLUG" \
-        --update-pr="comment" \
-        --copy-latest \
-        --ignore-missing-results \
-        --color
+    ALLURE_RESULTS_GLOB: qa/tmp/allure-results/*
 
 review-qa-smoke:
   extends:
@@ -121,23 +114,19 @@ review-performance:
       performance: performance.json
     expire_in: 31d
 
-allure-report-qa-smoke:
-  extends:
-    - .allure-report-base
-    - .review:rules:review-qa-smoke-report
-  needs: ["review-qa-smoke"]
-  variables:
-    ALLURE_REPORT_PATH_PREFIX: gitlab-review-smoke
-    ALLURE_JOB_NAME: review-qa-smoke
-
-allure-report-qa-reliable:
+# Generate single report for both smoke and reliable test jobs
+# Both job types are essentially the same:
+# * always executed
+# * always blocking
+allure-report-qa-blocking:
   extends:
     - .allure-report-base
-    - .review:rules:review-qa-reliable-report
-  needs: ["review-qa-reliable"]
+    - .review:rules:review-qa-blocking-report
+  needs:
+    - review-qa-smoke
+    - review-qa-reliable
   variables:
-    ALLURE_REPORT_PATH_PREFIX: gitlab-review-reliable
-    ALLURE_JOB_NAME: review-qa-reliable
+    ALLURE_JOB_NAME: review-qa-blocking
 
 allure-report-qa-all:
   extends:
@@ -145,18 +134,11 @@ allure-report-qa-all:
     - .review:rules:review-qa-all-report
   needs: ["review-qa-all"]
   variables:
-    ALLURE_REPORT_PATH_PREFIX: gitlab-review-all
     ALLURE_JOB_NAME: review-qa-all
 
 knapsack-report:
   extends:
-    - .review:rules:knapsack-report
-  image:
-    name: ${QA_IMAGE}
-    entrypoint: [""]
+    - .generate-knapsack-report-base
   stage: post-qa
-  allow_failure: true
-  before_script:
-    - cd qa
-  script:
-    - bundle exec rake 'knapsack:upload[tmp/knapsack/*/*.json]'
+  variables:
+    QA_KNAPSACK_REPORT_FILE_PATTERN: $CI_PROJECT_DIR/tmp/knapsack/*/*.json