Module: Mesa Branch: main Commit: e46702f7ae62316ff8e7b92cd7aa029f1d0374d7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e46702f7ae62316ff8e7b92cd7aa029f1d0374d7
Author: Eric Engestrom <e...@igalia.com> Date: Wed Dec 13 17:39:11 2023 +0000 ci: deduplicate constructing the ARTIFACTS_BASE_URL Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26670> --- .gitlab-ci.yml | 1 + .gitlab-ci/common/generate-env.sh | 1 + .gitlab-ci/deqp-runner.sh | 2 +- .gitlab-ci/gtest-runner.sh | 2 +- .gitlab-ci/lava/lava_job_submitter.py | 4 +--- .gitlab-ci/piglit/piglit-runner.sh | 2 +- .gitlab-ci/piglit/piglit-traces.sh | 2 -- .gitlab-ci/windows/deqp_runner_run.ps1 | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe24009dd87..f1d5d394e1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,6 +84,7 @@ variables: # Disable farm with `git mv .ci-farms{,-disabled}/$farm_name` # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name` # NEVER MIX FARM MAINTENANCE WITH ANY OTHER CHANGE IN THE SAME MERGE REQUEST! + ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${$CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts default: before_script: diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 802dd8872df..aa760e300a1 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -2,6 +2,7 @@ for var in \ ACO_DEBUG \ + ARTIFACTS_BASE_URL \ ASAN_OPTIONS \ BASE_SYSTEM_FORK_HOST_PREFIX \ BASE_SYSTEM_MAINLINE_HOST_PREFIX \ diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 91965aea45a..e586be3eb1e 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -230,7 +230,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"; + --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): if [ -n "$FLAKES_CHANNEL" ]; then diff --git a/.gitlab-ci/gtest-runner.sh b/.gitlab-ci/gtest-runner.sh index 09d062e88e7..c4ae1e741db 100755 --- a/.gitlab-ci/gtest-runner.sh +++ b/.gitlab-ci/gtest-runner.sh @@ -55,7 +55,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"; + --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): if [ -n "$FLAKES_CHANNEL" ]; then diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py index 158ff434896..0d38b43fe2b 100755 --- a/.gitlab-ci/lava/lava_job_submitter.py +++ b/.gitlab-ci/lava/lava_job_submitter.py @@ -458,10 +458,8 @@ class LAVAJobSubmitter(PathResolver): self.finish_script(last_attempt_job) def print_log_artifact_url(self): - base_url = "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/"; - artifacts_path = "-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/" relative_log_path = self.structured_log_file.relative_to(pathlib.Path.cwd()) - full_path = f"{base_url}{artifacts_path}{relative_log_path}" + full_path = f"$ARTIFACTS_BASE_URL/{relative_log_path}" artifact_url = path.expandvars(full_path) print_log(f"Structural Logging data available at: {artifact_url}") diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index aca1f2e56b1..d4ca9c7092f 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -106,7 +106,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"; + --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): if [ -n "$FLAKES_CHANNEL" ]; then diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 22b1747dc4a..13e4f4bbab2 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -190,8 +190,6 @@ then printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION" fi -ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts"; - ./piglit summary aggregate "$RESULTS" -o junit.xml PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}" diff --git a/.gitlab-ci/windows/deqp_runner_run.ps1 b/.gitlab-ci/windows/deqp_runner_run.ps1 index 42df3c09f3c..60079c090ae 100644 --- a/.gitlab-ci/windows/deqp_runner_run.ps1 +++ b/.gitlab-ci/windows/deqp_runner_run.ps1 @@ -27,7 +27,7 @@ deqp-runner suite --suite $($suite) ` $jobs $deqpstatus = $? -$template = "See https://$($env:CI_PROJECT_ROOT_NAMESPACE).pages.freedesktop.org/-/$($env:CI_PROJECT_NAME)/-/jobs/$($env:CI_JOB_ID)/artifacts/results/{{testcase}}.xml" +$template = "See $($env:ARTIFACTS_BASE_URL)/results/{{testcase}}.xml" deqp-runner junit --testsuite dEQP --results "$($results)/failures.csv" --output "$($results)/junit.xml" --limit 50 --template $template Copy-Item -Path "C:\deqp\testlog.css" -Destination $($results) Copy-Item -Path "C:\deqp\testlog.xsl" -Destination $($results)
