Commit 35a8650a authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 5fbf7682 c02c83fa
...@@ -201,7 +201,7 @@ function deploy() { ...@@ -201,7 +201,7 @@ function deploy() {
HELM_CMD=$(cat << EOF HELM_CMD=$(cat << EOF
helm upgrade --install \ helm upgrade --install \
--wait \ --wait \
--timeout 600 \ --timeout 900 \
--set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \
--set global.appConfig.enableUsagePing=false \ --set global.appConfig.enableUsagePing=false \
--set global.imagePullPolicy=Always \ --set global.imagePullPolicy=Always \
......
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