Merge branch 'avoid-cleanup-review-apps-while-running' into 'master'

Avoid running and cleaning review apps stepping on each others

See merge request gitlab-org/gitlab!92370

.gitlab/ci/review-apps/main.gitlab-ci.yml

@@ -73,7 +73,6 @@ review-build-cng:
   extends:
     - .default-retry
   image: ${REVIEW_APPS_IMAGE}
-  resource_group: "review/${CI_COMMIT_REF_NAME}"
   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:

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

@@ -6,6 +6,7 @@ review-cleanup:
     - .default-retry
     - .review:rules:review-cleanup
   image: ${REVIEW_APPS_IMAGE}
+  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: prepare
   environment:
     name: review/${CI_COMMIT_REF_SLUG}${SCHEDULE_TYPE} # No separator for SCHEDULE_TYPE so it's compatible as before and looks nice without it
@@ -25,6 +26,7 @@ review-cleanup:
 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:
     - job: build-assets-image