diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-14 14:34:40 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-14 14:38:36 +0300 |
| commit | 6932571f604131b016571dbc88d6f8de8275ef3a (patch) | |
| tree | 1c3277d6fdcf701265ca21b0a605c53c0b0ffbca | |
| parent | 4b3f2921b5f0d659b44aee6323d82fc3698a8ede (diff) | |
ci: Deduplicate definition of macOS test artifacts
The artifacts defined for macOS tests are the same as the one we have
defined for all other tests. Deduplicate them by using a JAML anchor.
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1470ac844..6a73ec165 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,7 @@ include: ruby -e "require 'json'; f = File.read(ENV['TEST_FULL_OUTPUT']); f.lines.each do |l| out = JSON.parse(l); puts out['Output']; end" | awk '/^panic/ || /goroutine/,/^\s*$/' echo -e "\e[0Ksection_end:`date +%s`:panic_stack_traces\r\e[0K" fi - artifacts: + artifacts: &test_artifacts paths: - ${CI_PROJECT_DIR}/ruby/tmp/gitaly-rspec-test.log - ${TEST_LOG_DIR} @@ -344,13 +344,7 @@ test:macos: PGUSER: gitlab TEST_OPTIONS: "-timeout=20m" # a number of tests may exceed the default 10m artifacts: - paths: - - ${CI_PROJECT_DIR}/ruby/tmp/gitaly-rspec-test.log - - ${TEST_LOG_DIR} - reports: - junit: ${TEST_REPORT} - when: always - expire_in: 1 week + <<: *test_artifacts verify:docs: image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.16-vale-2.20.2-markdownlint-0.32.2-markdownlint2-0.5.1 |