2 files changed, 27 insertions, 8 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index ac2a70dda0b..caa7d18c1ee 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -1,7 +1,6 @@
 .package-and-qa-base:
   image: ruby:2.6-alpine
   stage: qa
-  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   dependencies: []
   variables:
     GIT_DEPTH: "1"
@@ -20,14 +19,24 @@ package-and-qa-manual:
   extends:
     - .package-and-qa-base
     - .except-docs-qa
-  when: manual
   except:
-    - master
-    - /(^docs[\/-].+|.+-docs$)/
-    - /(^qa[\/-].*|.*-qa$)
+    refs:
+      - master
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
+  when: manual
+
+package-and-qa-manual:master:
+  extends:
+    - .package-and-qa-base
+  needs: ["build-qa-image", "gitlab:assets:compile"]
+  only:
+    refs:
+      - master
+  when: manual
 
 package-and-qa:
   extends: .package-and-qa-base
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   allow_failure: true
   only:
     - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 3415f1b6ab4..360e4433e57 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -22,7 +22,9 @@
     - source scripts/utils.sh
 
 .review-docker:
-  extends: .review-base
+  extends:
+    - .default-tags
+    - .default-retry
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine
   services:
     - docker:19.03.0-dind
@@ -36,7 +38,13 @@
     QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}"
 
 build-qa-image:
-  extends: .review-docker
+  extends:
+    - .review-docker
+    - .except-docs-qa
+  only:
+    refs:
+      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-ee
   stage: test
   script:
     - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} --file ./qa/Dockerfile ./
@@ -124,7 +132,9 @@ review-stop:
   artifacts: {}
 
 .review-qa-base:
-  extends: .review-docker
+  extends:
+    - .review-docker
+    - .review-only
   retry: 2
   stage: qa
   variables: