1 files changed, 28 insertions, 32 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 4f51409d6a8..46e62829394 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -23,42 +23,13 @@ review-cleanup:
     - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
     - gcp_cleanup
 
-review-app-pipeline-generate:
-  image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION}
-  stage: prepare
-  extends:
-    - .review:rules:start-review-app-pipeline
-  artifacts:
-    expire_in: 7d
-    paths:
-      - ${CHANGES_DIFFS_DIR}/*
-      - review-app-pipeline.yml
-  variables:
-    CHANGES_DIFFS_DIR: tmp/diffs
-  before_script:
-    - source scripts/utils.sh
-    - install_gitlab_gem
-    - tooling/bin/find_change_diffs ${CHANGES_DIFFS_DIR}
-  script:
-    - exit_code=0 && tooling/bin/qa/run_qa_check ${CHANGES_DIFFS_DIR} || exit_code=$?
-    - |
-      if [ $exit_code -eq 0 ]; then
-        echo "Review App will use the full pipeline"
-        cp .gitlab/ci/review-apps/main.gitlab-ci.yml review-app-pipeline.yml
-      elif [ $exit_code -eq 2 ]; then
-        echo "Skip Review App because the MR includes only quarantine changes"
-        cp .gitlab/ci/review-apps/skip-qa.gitlab-ci.yml review-app-pipeline.yml
-      else
-        exit $exit_code
-      fi
-
 start-review-app-pipeline:
   extends:
     - .review:rules:start-review-app-pipeline
   resource_group: review/${CI_COMMIT_REF_SLUG}${SCHEDULE_TYPE} # CI_ENVIRONMENT_SLUG is not available here and we want this to be the same as the environment
   stage: review
   needs:
-    - review-app-pipeline-generate
+    - job: e2e-test-pipeline-generate
     - job: build-assets-image
       artifacts: false
   # These variables are set in the pipeline schedules.
@@ -67,11 +38,36 @@ start-review-app-pipeline:
   variables:
     SCHEDULE_TYPE: $SCHEDULE_TYPE
     DAST_RUN: $DAST_RUN
+    SKIP_MESSAGE: Skipping review-app due to mr containing only quarantine changes!
   trigger:
+    strategy: depend
     include:
       - artifact: review-app-pipeline.yml
-        job: review-app-pipeline-generate
-    strategy: depend
+        job: e2e-test-pipeline-generate
+
+# Fetch child pipeline test results and store in parent pipeline
+# workaround until natively implemented: https://gitlab.com/groups/gitlab-org/-/epics/8205
+review-app-test-results:
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
+  stage: review
+  extends:
+    - .qa-cache
+    - .review:rules:start-review-app-pipeline
+  needs:
+    - start-review-app-pipeline
+  variables:
+    COLORIZED_LOGS: "true"
+    QA_LOG_LEVEL: "debug"
+  before_script:
+    - cd qa && bundle install
+  script:
+    - bundle exec rake "ci:download_test_results[start-review-app-pipeline,e2e-test-report,${CI_PROJECT_DIR}]"
+  when: always
+  allow_failure: true
+  artifacts:
+    when: always
+    reports:
+      junit: qa/tmp/rspec-*.xml
 
 danger-review:
   extends: