diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-28 08:59:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-28 08:59:55 +0000 |
| commit | 0540cb6b070579715c56942a7c92e4ba74920ebe (patch) | |
| tree | 53a451ffed8a254ff5936b2eee79131b00ef2f45 | |
| parent | 7732db2249da843cd87e4cdd3d6f968d66c0586f (diff) | |
| parent | 3c25ec8827d8db0f1232a55cde3640cc4275f672 (diff) | |
| download | gitlab-ce-0540cb6b070579715c56942a7c92e4ba74920ebe.tar.gz | |
Merge branch '59546-fix-error-handling-for-missing-domain' into 'master'
Fix Auto DevOps missing domain error handling
Closes #59546
See merge request gitlab-org/gitlab-ce!26627
| -rw-r--r-- | changelogs/unreleased/59546-fix-error-handling-for-missing-domain.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/59546-fix-error-handling-for-missing-domain.yml b/changelogs/unreleased/59546-fix-error-handling-for-missing-domain.yml new file mode 100644 index 00000000000..8f0ce5d57c5 --- /dev/null +++ b/changelogs/unreleased/59546-fix-error-handling-for-missing-domain.yml @@ -0,0 +1,5 @@ +--- +title: Fix Auto DevOps missing domain error handling +merge_request: 26627 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 7ec786b6d5d..78872b3bbe3 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -856,7 +856,7 @@ rollout 100%: function check_kube_domain() { ensure_kube_ingress_base_domain - if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then + if [[ -z "$KUBE_INGRESS_BASE_DOMAIN" ]]; then echo "In order to deploy or use Review Apps," echo "AUTO_DEVOPS_DOMAIN or KUBE_INGRESS_BASE_DOMAIN variables must be set" echo "From 11.8, you can set KUBE_INGRESS_BASE_DOMAIN in cluster settings" |