diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
| commit | ed335291dbeda5b34ae14c47eb7f9058cd5339f6 (patch) | |
| tree | 98420e96bdd3379df2777c98cee85e47b9ff078a /scripts | |
| parent | 2dce46e941eb55dc55f3d85984298d7a9654e2cc (diff) | |
| parent | 03e46cf72babbeb1df1320524fdf34b09fe1292c (diff) | |
| download | gitlab-ce-49479-hide-unmerged-env-perf-stats.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 49479-hide-unmerged-env-perf-stats49479-hide-unmerged-env-perf-stats
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 4 | ||||
| -rwxr-xr-x | scripts/trigger-build | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index d372bcbdab1..b180860899a 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -126,6 +126,9 @@ function deploy() { delete cleanup fi + + create_secret + helm repo add gitlab https://charts.gitlab.io/ helm dep update . @@ -133,6 +136,7 @@ HELM_CMD=$(cat << EOF helm upgrade --install \ --wait \ --timeout 600 \ + --set global.appConfig.enableUsagePing=false \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set global.hosts.hostSuffix="$HOST_SUFFIX" \ --set global.hosts.domain="$REVIEW_APPS_DOMAIN" \ diff --git a/scripts/trigger-build b/scripts/trigger-build index dd0425b6472..873c41db456 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -107,7 +107,8 @@ module Trigger { 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], 'ALTERNATIVE_SOURCES' => 'true', - 'ee' => Trigger.ee? ? 'true' : 'false' + 'ee' => Trigger.ee? ? 'true' : 'false', + 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' } end end |