summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-04-19 13:33:58 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-04-19 13:33:58 +0000
commit1879486daf66141088f2c935c76b38e0a4ce7df1 (patch)
tree8e708c67d05da8bd144862ebe1b43e396e3aa20f /.gitlab
parent1a4206d8eb34130c46a9cb6d188e0f83f8ec0186 (diff)
parentd0efb430ce43953d659b1f62bf58a9ac41804bc3 (diff)
downloadgitlab-ce-1879486daf66141088f2c935c76b38e0a4ce7df1.tar.gz
Merge branch 'retry-review-deploy-twice' into 'master'
Retry the review-deploy job twice and make the Review App cleanup more efficient See merge request gitlab-org/gitlab-ce!27489
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index dee72930a28..9cfb50eeefc 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -32,7 +32,6 @@
environment: &review-environment
name: review/${CI_COMMIT_REF_NAME}
url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
- before_script: []
.review-docker: &review-docker
<<: *review-base
@@ -48,6 +47,7 @@
DOCKER_HOST: tcp://docker:2375
LATEST_QA_IMAGE: "gitlab/${CI_PROJECT_NAME}-qa:nightly"
QA_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/${CI_PROJECT_NAME}-qa:${CI_COMMIT_REF_SLUG}"
+ before_script: []
build-qa-image:
<<: *review-docker
@@ -85,6 +85,7 @@ schedule:review-build-cng:
.review-deploy-base: &review-deploy-base
<<: *review-base
+ retry: 2
allow_failure: true
variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"