diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-02-19 23:26:58 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-20 16:33:29 +0300 |
| commit | 4dfb7853ebd0ba1c49fd8d69c2f93bb0c7a7c0da (patch) | |
| tree | 0cba147e89292b89d23de0ba792decc1ef9a694f /lib | |
| parent | 902e4f63d6fffe782757bcc3c6c0963e02250eb1 (diff) | |
Merge branch '57798-fix-auto-devops-empty-str-check' into 'master'
Fix Auto DevOps check domain is blank
Closes #57798
See merge request gitlab-org/gitlab-ce!25308
(cherry picked from commit 8a16c07dd82ac7cb84f99e2f4d0a3e2b5b118fbf)
2d300104 Fix Auto DevOps check domain is blank
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index e369d26f22f..cb547cc2eaa 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -826,7 +826,7 @@ rollout 100%: # Function to ensure backwards compatibility with AUTO_DEVOPS_DOMAIN function ensure_kube_ingress_base_domain() { - if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then + if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN fi } |