From f6342cbb56ac948d859eb959b1edad68c96c4170 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Wed, 19 Apr 2023 06:45:22 +0200 Subject: Makefile: Clarify variables that specify test report paths The variables `TEST_REPORT` and `TEST_FULL_OUTPUT` allow the developer to specify where the test report and the full test output shall be written to. It's not immediately obvious what this is though: - `TEST_REPORT` specifies the location of the JUnit-style test report. - `TEST_FULL_OUTPUT` specifies the location of the JSON-style test report as it would be written by `go test -json`. Rename the variables to `TEST_JUNIT_REPORT` and `TEST_JSON_REPORT` to hopefully clarify what their respective intent is. Adjust their paths to match. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c872b6f90..735cc2555 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,9 +95,9 @@ workflow: PGUSER: postgres POSTGRES_DB: praefect_test POSTGRES_HOST_AUTH_METHOD: trust - TEST_REPORT: "${CI_PROJECT_DIR}/_build/reports/go-tests-report.xml" + TEST_JUNIT_REPORT: "${CI_PROJECT_DIR}/_build/reports/tests-junit.xml" TEST_COVERAGE_DIR: "${CI_PROJECT_DIR}/_build/reports/coverage" - TEST_FULL_OUTPUT: "${CI_PROJECT_DIR}/_build/reports/test-output.log" + TEST_JSON_REPORT: "${CI_PROJECT_DIR}/_build/reports/test-report.json" TEST_LOG_DIR: "${CI_PROJECT_DIR}/_build/reports/test-logs" TEST_OPTIONS: "-count=1 -timeout=20m" # a number of tests may exceed the default 10m before_script: &test_before_script @@ -117,7 +117,7 @@ workflow: paths: - ${TEST_LOG_DIR} reports: - junit: ${TEST_REPORT} + junit: ${TEST_JUNIT_REPORT} when: always expire_in: 1 week -- cgit v1.2.3