Commit d3c4c5d0 authored by Nick Thomas's avatar Nick Thomas

Merge branch...

Merge branch '59113-review-apps-initial-seeding-is-broken-due-to-runners_registration_token-openssl-cipher-ciphererror-error-somehow' into 'master'

Fix the .review-deploy-base job so that env variables are passed

Closes #59113

See merge request !26275
parents a0289b5c dc2a482b
Pipeline #52573119 passed with stages
in 63 minutes and 33 seconds
......@@ -1053,15 +1053,7 @@ schedule:review-build-cng:
- source ./scripts/review_apps/review-apps.sh
script:
- wait_for_job_to_be_done "review-build-cng"
after_script:
- source ./scripts/review_apps/review-apps.sh
- check_kube_domain
- download_gitlab_chart
- ensure_namespace
- install_tiller
- install_external_dns
- time deploy
- add_license
- perform_review_app_deployment
review-deploy:
<<: *review-deploy-base
......@@ -1071,6 +1063,7 @@ schedule:review-deploy:
<<: *review-schedules-only
script:
- wait_for_job_to_be_done "schedule:review-build-cng"
- perform_review_app_deployment
.review-qa-base: &review-qa-base
<<: *review-docker
......@@ -1117,8 +1110,7 @@ review-qa-all:
<<: *review-qa-base
script:
- wait_for_job_to_be_done "review-deploy"
after_script:
- mkdir gitlab-exporter
- mkdir -p gitlab-exporter
- wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
- mkdir sitespeed-results
- docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL"
......
......@@ -4,6 +4,16 @@ export TILLER_NAMESPACE="$KUBE_NAMESPACE"
function echoerr() { printf "\033[0;31m%s\n\033[0m" "$*" >&2; }
function echoinfo() { printf "\033[0;33m%s\n\033[0m" "$*" >&2; }
function perform_review_app_deployment() {
check_kube_domain
download_gitlab_chart
ensure_namespace
install_tiller
install_external_dns
time deploy
add_license
}
function check_kube_domain() {
if [ -z ${REVIEW_APPS_DOMAIN+x} ]; then
echo "In order to deploy or use Review Apps, REVIEW_APPS_DOMAIN variable must be set"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment