Use the 'needs' keyword for 'package-and-qa-always' job

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab/ci/qa.gitlab-ci.yml

 .package-and-qa-base:
   image: ruby:2.6-alpine
-  stage: review  # So even if review-deploy failed we can still run this
+  stage: qa
   before_script: []
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   dependencies: []
   cache: {}
   variables:
@@ -14,12 +15,16 @@
   only:
     - branches@gitlab-org/gitlab-ce
     - branches@gitlab-org/gitlab-ee
+  except:
+    - master
 
 package-and-qa-manual:
-  extends:
-    - .package-and-qa-base
-    - .no-docs-and-no-qa
+  extends: .package-and-qa-base
   when: manual
+  except:
+    - master
+    - /(^docs[\/-].+|.+-docs$)/
+    - /(^qa[\/-].*|.*-qa$)
 
 package-and-qa:
   extends: .package-and-qa-base