3 files changed, 17 insertions, 6 deletions
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml
index 7f3ae70da8c..37ccecc0562 100644
--- a/.gitlab/ci/review-apps/main.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml
@@ -14,7 +14,7 @@ include:
 .base-before_script: &base-before_script
   - source ./scripts/utils.sh
   - source ./scripts/review_apps/review-apps.sh
-  - install_api_client_dependencies_with_apk
+  - apt-get update && apt-get install -y jq
 
 review-build-cng-env:
   extends:
@@ -72,8 +72,7 @@ review-build-cng:
 .review-workflow-base:
   extends:
     - .default-retry
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3.5-kubectl1.17
-  resource_group: "review/${CI_COMMIT_REF_NAME}"
+  image: ${REVIEW_APPS_IMAGE}
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -139,6 +138,7 @@ review-stop:
   extends:
     - .review-stop-base
     - .review:rules:review-stop
+  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: deploy
   needs: []
   script:
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
index 8c48e803ad3..631fe7fef30 100644
--- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
@@ -88,10 +88,8 @@ download-knapsack-report:
     - .bundle-base
     - .review:rules:review-qa-reliable
   stage: prepare
-  variables:
-    QA_KNAPSACK_REPORTS: review-qa-reliable,review-qa-all
   script:
-    - bundle exec rake "knapsack:download"
+    - bundle exec rake "knapsack:download[qa]"
   allow_failure: true
   artifacts:
     paths:
diff --git a/.gitlab/ci/review-apps/skip-qa.gitlab-ci.yml b/.gitlab/ci/review-apps/skip-qa.gitlab-ci.yml
new file mode 100644
index 00000000000..1305673a4d8
--- /dev/null
+++ b/.gitlab/ci/review-apps/skip-qa.gitlab-ci.yml
@@ -0,0 +1,13 @@
+stages:
+  - review
+
+include:
+  - local: .gitlab/ci/global.gitlab-ci.yml
+  - local: .gitlab/ci/rules.gitlab-ci.yml
+
+no-op:
+  extends:
+    - .review:rules:start-review-app-pipeline
+  stage: review
+  script:
+    - echo "Skip Review App because the MR includes only quarantine changes"