diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-19 08:30:25 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-19 08:31:20 +0100 |
| commit | dc2a482ba16fb43d8b772209b3a6863be3843f81 (patch) | |
| tree | f48dbfa7f77f319c65d1e5306d5eccc0f087f6c5 | |
| parent | 68aacd65ae3c53f3c1d2cf081adc89e3758c52de (diff) | |
| download | gitlab-ce-dc2a482ba16fb43d8b772209b3a6863be3843f81.tar.gz | |
Fix the .review-deploy-base job so that env variables are passed
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f453fcf9f22..2de6c0d2cc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index f610485a700..32fce946c17 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -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" |