Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 15:06:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 15:06:04 +0300
commit81c6c53d6cd5ffde1c070d987dc2985f662cb301 (patch)
tree97ddbeb02373e8134edaa3e045f74d41d66cd500 /.gitlab
parentf7e0be9bbe1173b0de18a52a21b49d19349f40b7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/reports.gitlab-ci.yml1
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index e380838ea7d..16c3f0e4f8c 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -198,6 +198,7 @@ dast:
- .only-code-qa-changes
- .only-review
stage: qa
+ needs: ["review-deploy"]
dependencies: ["review-deploy"]
before_script:
- export DAST_WEBSITE="$(cat review_app_url.txt)"
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 610b0678db1..ef7827fc917 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -183,6 +183,7 @@ review-cleanup-failed-deployment:
GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
+ needs: ["review-deploy"]
dependencies: ["review-deploy"]
artifacts:
paths:
@@ -239,6 +240,8 @@ review-performance:
extends:
- .review-performance-base
- .only-review
+ needs: ["review-deploy"]
+ dependencies: ["review-deploy"]
before_script:
- export CI_ENVIRONMENT_URL="$(cat review_app_url.txt)"
- echo "${CI_ENVIRONMENT_URL}"
@@ -259,6 +262,7 @@ schedule:review-performance:
extends:
- .review-performance-base
- .only-review-schedules
+ needs: ["schedule:review-deploy"]
dependencies: ["schedule:review-deploy"]
parallel-spec-reports: