diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-01 09:33:41 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-08-01 09:33:41 +0000 |
| commit | 011093ce68f672c77735026a18dd96a9e2f8f106 (patch) | |
| tree | cd45d9645bb029f6dc2a1c496fa4f1f7b7761768 | |
| parent | 49fbf37ce299180a706264d991cc1cf754ad3240 (diff) | |
| parent | 8f501a74bde199723e1f01121a9a56e01aacaf1c (diff) | |
| download | gitlab-ce-011093ce68f672c77735026a18dd96a9e2f8f106.tar.gz | |
Merge branch '65003-remove-wait_for_review_app_to_be_accessible-step' into 'master'
Remove the wait_for_review_app_to_be_accessible step from review-deploy
Closes #65003
See merge request gitlab-org/gitlab-ce!31296
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 25 |
2 files changed, 1 insertions, 27 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 41d52c4e095..aa722f6ef33 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -101,8 +101,7 @@ schedule:review-build-cng: - install_tiller - install_external_dns - download_chart - - deploy || display_deployment_debug - - wait_for_review_app_to_be_accessible + - deploy || (display_deployment_debug && exit 1) - add_license artifacts: paths: [review_app_url.txt] diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 408a0595f9e..4935c1342a3 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -340,31 +340,6 @@ function display_deployment_debug() { fi } -function wait_for_review_app_to_be_accessible() { - echoinfo "Waiting for the Review App at ${CI_ENVIRONMENT_URL} to be accessible..." true - - local interval=5 - local elapsed_seconds=0 - local max_seconds=$((2 * 60)) - while true; do - local review_app_http_code - 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 - - let "elapsed_seconds+=interval" - sleep ${interval} - done - - if [[ "${review_app_http_code}" -eq "200" ]]; then - echoinfo "The Review App at ${CI_ENVIRONMENT_URL} is ready after ${elapsed_seconds} seconds!" - else - echoerr "The Review App at ${CI_ENVIRONMENT_URL} isn't ready after ${max_seconds} seconds of polling..." - exit 1 - fi -} - function add_license() { if [ -z "${REVIEW_APPS_EE_LICENSE}" ]; then echo "License not found" && return; fi |