Merge branch 'jh-review-app-base-config' into 'master'

JH review app base config

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127311



Merged-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: Kevin Morrison <kmorrison@gitlab.com>
Approved-by: Aman Luthra <aluthra@gitlab.com>
Approved-by: Ameya Darshan <adarshan@gitlab.com>
Co-authored-by: tianl677 <tianlu1677@gmail.com>

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

@@ -69,6 +69,7 @@ review-build-cng:
     GITLAB_REPO_URL: ${CI_PROJECT_URL}
     GITLAB_IMAGE_REPOSITORY: "registry.gitlab.com/gitlab-org/build/cng-mirror"
     GITLAB_IMAGE_SUFFIX: "ee"
+    GITLAB_REVIEW_APP_BASE_CONFIG_FILE: "scripts/review_apps/base-config.yaml"
     GITLAB_HELM_CHART_REF: "75b1486a9aec212d0f49ef1251526d8e51004bbc"  # 7.0.1: https://gitlab.com/gitlab-org/charts/gitlab/-/commit/75b1486a9aec212d0f49ef1251526d8e51004bbc
   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

scripts/review_apps/review-apps.sh

@@ -243,7 +243,7 @@ function download_chart() {
 function base_config_changed() {
   if [ -z "${CI_MERGE_REQUEST_IID}" ]; then return; fi
 
-  curl "${CI_API_V4_URL}/projects/${CI_MERGE_REQUEST_PROJECT_ID}/merge_requests/${CI_MERGE_REQUEST_IID}/changes" | jq '.changes | any(.old_path == "scripts/review_apps/base-config.yaml")'
+  curl "${CI_API_V4_URL}/projects/${CI_MERGE_REQUEST_PROJECT_ID}/merge_requests/${CI_MERGE_REQUEST_IID}/changes" | jq --arg path "${GITLAB_REVIEW_APP_BASE_CONFIG_FILE}" '.changes | any(.old_path == $path)'
 }
 
 function parse_gitaly_image_tag() {
@@ -263,7 +263,7 @@ function deploy() {
   local base_config_file_ref="${CI_DEFAULT_BRANCH}"
 
   if [[ "$(base_config_changed)" == "true" ]]; then base_config_file_ref="${CI_COMMIT_SHA}"; fi
-  local base_config_file="${GITLAB_REPO_URL}/raw/${base_config_file_ref}/scripts/review_apps/base-config.yaml"
+  local base_config_file="${GITLAB_REPO_URL}/raw/${base_config_file_ref}/${GITLAB_REVIEW_APP_BASE_CONFIG_FILE}"
 
   echoinfo "Deploying ${release} to ${CI_ENVIRONMENT_URL} ..." true