summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-04-17 11:22:10 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-04-17 11:22:10 +0000
commit38da5d6b23577edcd2a924125e0e4f3f8236f234 (patch)
tree03736194a1fa28224762124f6d0b3c30539801b6
parentcfa5c30792ced178e53d1f7782ae027204ce8821 (diff)
parent955136b56dd0551c18fc9917a3ea94790081d9df (diff)
downloadgitlab-ce-38da5d6b23577edcd2a924125e0e4f3f8236f234.tar.gz
Merge branch 'qa-fix-review-app-ping' into 'master'
Don't fail the job if the Review App doesn't deploy properly See merge request gitlab-org/gitlab-ce!27223
-rwxr-xr-xscripts/review_apps/review-apps.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh
index 22e47ce2c0a..51cfd145ba8 100755
--- a/scripts/review_apps/review-apps.sh
+++ b/scripts/review_apps/review-apps.sh
@@ -109,7 +109,7 @@ function perform_review_app_deployment() {
ensure_namespace
install_tiller
install_external_dns
- time deploy || true
+ time deploy
wait_for_review_app_to_be_accessible
add_license
}
@@ -270,7 +270,7 @@ EOF
echoinfo "Deploying with:"
echoinfo "${HELM_CMD}"
- eval $HELM_CMD
+ eval $HELM_CMD || true
}
function wait_for_review_app_to_be_accessible() {