Merge branch '215151-follow-up-from-fix-gitlab_edition-for-gitlab-ce' into 'master'

Resolve "Follow-up from "Fix GITLAB_EDITION for gitlab ce""

Closes #215151

See merge request gitlab-org/gitlab!30272

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

-.review-docker:
-  extends:
-    - .default-retry
-    - .use-docker-in-docker
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
-  variables:
-    GITLAB_EDITION: "ce"
-
 build-qa-image:
   extends:
     - .use-kaniko
     - .default-retry
     - .review:rules:mr-and-schedule-auto
   stage: prepare
-  variables:
-    GITLAB_EDITION: "ce"
   script:
-    - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
-    - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"
+    - '[[ -d "ee/" ]] || export GITLAB_EDITION="ce"'
+    - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION:-ee}-qa:${CI_COMMIT_REF_SLUG}"
     - /kaniko/executor --context=${CI_PROJECT_DIR} --dockerfile=${CI_PROJECT_DIR}/qa/Dockerfile --destination=${QA_IMAGE} --cache=true
 
 review-cleanup:
@@ -81,7 +71,7 @@ review-deploy:
   resource_group: "review/${CI_COMMIT_REF_NAME}"
   allow_failure: true
   before_script:
-    - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
+    - '[[ -d "ee/" ]] || export GITLAB_EDITION="ce"'
     - export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
     - export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
     - export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
@@ -138,7 +128,10 @@ review-stop:
     - delete_release
 
 .review-qa-base:
-  extends: .review-docker
+  extends:
+    - .default-retry
+    - .use-docker-in-docker
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
   stage: qa
   # This is needed so that manual jobs with needs don't block the pipeline.
   # See https://gitlab.com/gitlab-org/gitlab/-/issues/199979.
@@ -155,8 +148,8 @@ review-stop:
     GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
     EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
   before_script:
-    - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
-    - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"
+    - '[[ -d "ee/" ]] || export GITLAB_EDITION="ce"'
+    - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION:-ee}-qa:${CI_COMMIT_REF_SLUG}"
     - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
     - echo "${CI_ENVIRONMENT_URL}"
     - echo "${QA_IMAGE}"

scripts/review_apps/review-apps.sh

@@ -236,7 +236,7 @@ function base_config_changed() {
 function deploy() {
   local namespace="${KUBE_NAMESPACE}"
   local release="${CI_ENVIRONMENT_SLUG}"
-  local edition="${GITLAB_EDITION-ce}"
+  local edition="${GITLAB_EDITION:-ee}"
   local base_config_file_ref="master"
   if [[ "$(base_config_changed)" == "true" ]]; then base_config_file_ref="${CI_COMMIT_SHA}"; fi
   local base_config_file="https://gitlab.com/gitlab-org/gitlab/raw/${base_config_file_ref}/scripts/review_apps/base-config.yaml"