diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-05-16 14:51:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-05-16 14:51:20 +0000 |
| commit | bc852e05e388b6f85462a89bf395f74cf16a97de (patch) | |
| tree | 07bd9df72e4a2b46488c04d1825f707ecb894951 | |
| parent | 2bde9de6088cf24aae6a721c9680cf8e5814f2fc (diff) | |
| parent | 8bd6f72ee6da0d9a346864a0c20ea7ca949ccf7d (diff) | |
| download | gitlab-ce-bc852e05e388b6f85462a89bf395f74cf16a97de.tar.gz | |
Merge branch 'disallow-review-deploy-to-fail' into 'master'
Disallow the review-deploy and review-qa-smoke jobs to fail
See merge request gitlab-org/gitlab-ce!28314
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 3a024c44fe2..80356fa1dc2 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -78,7 +78,6 @@ schedule:review-build-cng: <<: *review-base stage: review retry: 2 - allow_failure: true variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" @@ -130,7 +129,6 @@ review-stop: .review-qa-base: &review-qa-base <<: *review-docker stage: qa - allow_failure: true variables: <<: *review-docker-variables QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa" @@ -165,13 +163,14 @@ review-qa-smoke: review-qa-all: <<: *review-qa-base + allow_failure: true when: manual script: - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" .review-performance-base: &review-performance-base <<: *review-qa-base - stage: qa + allow_failure: true before_script: - export CI_ENVIRONMENT_URL="$(cat review_app_url.txt)" - echo "${CI_ENVIRONMENT_URL}" |