diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-05-31 17:54:51 +0100 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-05-31 17:54:51 +0100 |
| commit | 0c91fc6228539a550779f857e969abe7e89f8cb6 (patch) | |
| tree | 5dfa74bc21fa81581962b32df81e7cc555d25981 | |
| parent | 6d785e6967819077e6589ce84b17ec858beaede4 (diff) | |
| download | gitlab-ce-cp-58941-use-gitlab-serverless-with-existing-knative-installation.tar.gz | |
Trying to log podscp-58941-use-gitlab-serverless-with-existing-knative-installation
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 938c436aece..ed5ae109e9e 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -206,7 +206,7 @@ function deploy() { HELM_CMD=$(cat << EOF helm upgrade --install \ --wait \ - --timeout 900 \ + --timeout 600 \ --set global.appConfig.enableUsagePing=false \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set global.hosts.hostSuffix="$HOST_SUFFIX" \ @@ -252,18 +252,18 @@ EOF echoinfo "Deploying with:" echoinfo "${HELM_CMD}" - # eval $HELM_CMD || kubectl -n ${KUBE_NAMESPACE} get events --sort-by='{.lastTimestamp}' || true - eval $HELM_CMD || true + eval $HELM_CMD || kubectl -n ${KUBE_NAMESPACE} get events --sort-by='{.lastTimestamp}' || true + # eval $HELM_CMD || true } function wait_for_review_app_to_be_accessible() { # In case the Review App isn't completely available yet. Keep trying for 5 minutes. local interval=5 local elapsed_seconds=0 - local max_seconds=$((10 * 60)) + local max_seconds=$((5 * 60)) while true; do local review_app_http_code - review_app_http_code=$(curl --silent --output /dev/null --max-time 10 --write-out "%{http_code}" "${CI_ENVIRONMENT_URL}/users/sign_in") + review_app_http_code=$(curl --silent --output /dev/null --max-time 5 --write-out "%{http_code}" "${CI_ENVIRONMENT_URL}/users/sign_in") if [[ "${review_app_http_code}" -eq "200" ]] || [[ "${elapsed_seconds}" -gt "${max_seconds}" ]]; then break fi |