Commit a706bda0 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 240f8cb5 2cb7463a
...@@ -77,7 +77,6 @@ schedule:review-build-cng: ...@@ -77,7 +77,6 @@ schedule:review-build-cng:
review-deploy: review-deploy:
extends: .review-base extends: .review-base
allow_failure: true allow_failure: true
retry: 1
stage: review stage: review
needs: ["review-build-cng"] needs: ["review-build-cng"]
variables: variables:
...@@ -147,7 +146,6 @@ review-cleanup-failed-deployment: ...@@ -147,7 +146,6 @@ review-cleanup-failed-deployment:
extends: extends:
- .review-docker - .review-docker
- .review-only - .review-only
retry: 2
stage: qa stage: qa
variables: variables:
QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa" QA_ARTIFACTS_DIR: "${CI_PROJECT_DIR}/qa"
......
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