Merge branch '205420-make-review-deploy-depend-on-review-build-cng' into 'master'

Make 'review-deploy' depend on 'review-build-cng' with 'needs'

Closes #205420

See merge request gitlab-org/gitlab!25137

.gitlab/ci/review.gitlab-ci.yml

@@ -126,7 +126,6 @@ review-build-cng:
     - .default-tags
     - .default-retry
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
-  dependencies: []
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -142,6 +141,9 @@ review-deploy:
     - .review-workflow-base
     - .review:rules:mr-and-schedule
   stage: review
+  needs:
+    - job: review-build-cng
+      artifacts: false
   allow_failure: true
   before_script:
     - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
@@ -169,6 +171,7 @@ review-deploy:
   extends: .review-workflow-base
   environment:
     action: stop
+  dependencies: []
   variables:
     # We're cloning the repo instead of downloading the script for now
     # because some repos are private and CI_JOB_TOKEN cannot access files.

doc/development/pipelines.md

@@ -253,7 +253,6 @@ graph RL;
   E[review-build-cng];
   F[build-qa-image];
   G[review-deploy];
-  G2["schedule:review-deploy<br/>(master only)"];
   I["karma, jest, webpack-dev-server, static-analysis"];
   I2["karma-foss, jest-foss<br/>(EE default refs only)"];
   J["compile-assets pull-push-cache<br/>(master only)"];
@@ -297,19 +296,16 @@ subgraph "`post-test` stage"
 
 subgraph "`review-prepare` stage"
     E -.-> |needs| C;
-    E2["schedule:review-build-cng<br/>(master schedule only)"] -.-> |needs| C;
     end
 
 subgraph "`review` stage"
-    G --> |happens after| E
-    G2 --> |happens after| E2
+    G -.-> |needs| E
     end
 
 subgraph "`qa` stage"
     Q -.-> |needs| C;
     Q -.-> |needs| F;
-    QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs and depends on| G;
-    QA2["schedule:review-performance<br/>(master only)"] -.-> |needs and depends on| G2;
+    QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs| G;
     end
 
 subgraph "`post-qa` stage"