diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
| commit | 41e5ec8f74d9909050d54ae957b09a812a398c8e (patch) | |
| tree | 8d07352840703d1421e53c2e8a595cd4da049842 /.gitlab-ci.yml | |
| parent | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (diff) | |
| parent | 685066cd0e4bb9c2279c1ed43ae445d07c963743 (diff) | |
| download | gitlab-ce-41e5ec8f74d9909050d54ae957b09a812a398c8e.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fd42386b95..61c08429c96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,6 +125,7 @@ stages: - export KNAPSACK_GENERATE_REPORT=true - export CACHE_CLASSES=true - cp ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH} + - scripts/gitaly-test-spawn - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)' artifacts: expire_in: 31d @@ -207,11 +208,10 @@ update-tests-metadata: - '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH' - '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $FLAKY_RSPEC_SUITE_REPORT_PATH' - rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json - - rm -f rspec_flaky/${CI_PROJECT_NAME}/all_node_*.json + - rm -f rspec_flaky/${CI_PROJECT_NAME}/*_node_*.json flaky-examples-check: <<: *dedicated-runner - <<: *except-docs image: ruby:2.3-alpine services: [] before_script: [] @@ -226,6 +226,7 @@ flaky-examples-check: - branches except: - master + - /(^docs[\/-].*|.*-docs$)/ artifacts: expire_in: 30d paths: |