diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 21:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 21:09:05 +0300 |
commit | 20a86e7f6fd58882025b1c85b21e891d75220da5 (patch) | |
tree | 31d400a3790b2b3650415e5caf1cabfbe8d9092e /scripts/review_apps | |
parent | 04ac4180cb5ba0df460034c7e64862056fd498b3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
-rw-r--r-- | scripts/review_apps/base-config.yaml | 3 | ||||
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index eb1b1faf9d4..9b77ff80d42 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -10,6 +10,9 @@ upgradeCheck: global: appConfig: enableUsagePing: false + extraEnv: + GITLAB_LICENSE_MODE: test + CUSTOMER_PORTAL_URL: https://customers.staging.gitlab.com image: pullPolicy: Always ingress: diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 54924fb8a34..6ebb0f61a04 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -208,14 +208,14 @@ function create_application_secret() { echoinfo "The 'shared-gitlab-initial-root-password' secret already exists in the ${namespace} namespace." fi - if [ -z "${REVIEW_APPS_EE_LICENSE_FILE}" ]; then echo "License not found" && return; fi + if [ -z "${QA_EE_LICENSE}" ]; then echo "License not found" && return; fi gitlab_license_shared_secret=$(kubectl get secret --namespace "${namespace}" --no-headers -o=custom-columns=NAME:.metadata.name shared-gitlab-license 2> /dev/null | tail -n 1) if [[ "${gitlab_license_shared_secret}" == "" ]]; then echoinfo "Creating the 'shared-gitlab-license' secret in the "${namespace}" namespace..." true kubectl create secret generic --namespace "${namespace}" \ "shared-gitlab-license" \ - --from-file=license="${REVIEW_APPS_EE_LICENSE_FILE}" \ + --from-literal=license="${QA_EE_LICENSE}" \ --dry-run=client -o json | kubectl apply -f - else echoinfo "The 'shared-gitlab-license' secret already exists in the ${namespace} namespace." @@ -356,7 +356,7 @@ HELM_CMD=$(cat << EOF EOF ) -if [ -n "${REVIEW_APPS_EE_LICENSE_FILE}" ]; then +if [ -n "${QA_EE_LICENSE}" ]; then HELM_CMD=$(cat << EOF ${HELM_CMD} \ --set global.gitlab.license.secret="shared-gitlab-license" |