summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-12 12:04:46 +0200
committerRémy Coutable <remy@rymai.me>2018-07-17 09:43:46 +0200
commit0c1accd5042ff36520e6bac2c66edfd50b7043bc (patch)
tree19c0a272dee72525a44b78e50483b494b7a9d3e8 /.gitlab-ci.yml
parent7f0431dd8550ac9d229d1383c03386c1634d015f (diff)
downloadgitlab-ce-0c1accd5042ff36520e6bac2c66edfd50b7043bc.tar.gz
Move the 'danger-review' job to the test stage and allow it to fail
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml40
1 files changed, 21 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7b28e540a5..afe9da08495 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,25 +350,6 @@ retrieve-tests-metadata:
- wget -O $FLAKY_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$FLAKY_RSPEC_SUITE_REPORT_PATH || rm $FLAKY_RSPEC_SUITE_REPORT_PATH
- '[[ -f $FLAKY_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_SUITE_REPORT_PATH}'
-danger-review:
- image: registry.gitlab.com/gitlab-org/gitaly/dangercontainer:latest
- stage: prepare
- allow_failure: true
- before_script:
- - source scripts/utils.sh
- - retry gem install danger --no-ri --no-rdoc
- cache: {}
- only:
- refs:
- - branches@gitlab-org/gitlab-ce
- - branches@gitlab-org/gitlab-ee
- except:
- variables:
- - $CI_COMMIT_REF_NAME =~ /^ce-to-ee-.*/
- script:
- - git version
- - danger --fail-on-errors=true
-
update-tests-metadata:
<<: *tests-metadata-state
<<: *only-canonical-masters
@@ -457,6 +438,27 @@ setup-test-env:
- config/secrets.yml
- vendor/gitaly-ruby
+danger-review:
+ image: registry.gitlab.com/gitlab-org/gitaly/dangercontainer:latest
+ stage: test
+ allow_failure: true
+ before_script:
+ - source scripts/utils.sh
+ - retry gem install danger --no-ri --no-rdoc
+ cache: {}
+ only:
+ refs:
+ - branches@gitlab-org/gitlab-ce
+ - branches@gitlab-org/gitlab-ee
+ except:
+ refs:
+ - master
+ variables:
+ - $CI_COMMIT_REF_NAME =~ /^ce-to-ee-.*/
+ script:
+ - git version
+ - danger --fail-on-errors=true
+
rspec-pg 0 30: *rspec-metadata-pg
rspec-pg 1 30: *rspec-metadata-pg
rspec-pg 2 30: *rspec-metadata-pg