Commit bc852e05 authored by Sean McGivern's avatar Sean McGivern

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
parents 2bde9de6 8bd6f72e
...@@ -78,7 +78,6 @@ schedule:review-build-cng: ...@@ -78,7 +78,6 @@ schedule:review-build-cng:
<<: *review-base <<: *review-base
stage: review stage: review
retry: 2 retry: 2
allow_failure: true
variables: variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
...@@ -130,7 +129,6 @@ review-stop: ...@@ -130,7 +129,6 @@ review-stop:
.review-qa-base: &review-qa-base .review-qa-base: &review-qa-base
<<: *review-docker <<: *review-docker
stage: qa stage: qa
allow_failure: true
variables: variables:
<<: *review-docker-variables <<: *review-docker-variables
QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa" QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa"
...@@ -165,13 +163,14 @@ review-qa-smoke: ...@@ -165,13 +163,14 @@ review-qa-smoke:
review-qa-all: review-qa-all:
<<: *review-qa-base <<: *review-qa-base
allow_failure: true
when: manual when: manual
script: script:
- gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}"
.review-performance-base: &review-performance-base .review-performance-base: &review-performance-base
<<: *review-qa-base <<: *review-qa-base
stage: qa allow_failure: true
before_script: before_script:
- export CI_ENVIRONMENT_URL="$(cat review_app_url.txt)" - export CI_ENVIRONMENT_URL="$(cat review_app_url.txt)"
- echo "${CI_ENVIRONMENT_URL}" - echo "${CI_ENVIRONMENT_URL}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment