From efd1d5cc59621521a05389e9ab2bff6e4e96aab6 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 24 Mar 2021 22:46:39 -0400 Subject: [PATCH] ci: Use CI_PROJECT_ROOT_NAMESPACE Currently, the template in e.g. .gitlab-ci/deqp-runner.sh containing See https://$CI_PROJECT_NAMESPACE.pages.freedesktop.org/-/... will print an invalid URL. Copied from .gitlab-ci/piglit/run.sh which already uses CI_PROJECT_ROOT_NAMESPACE in its template. Part-of: --- .gitlab-ci/deqp-runner.sh | 2 +- .gitlab-ci/piglit/piglit-runner.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 8a52b7909cc..2641dea4543 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -267,7 +267,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml" + --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): quiet report_flakes $RESULTS_CSV diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index ae07613d285..384a617a84c 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -126,7 +126,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml" + --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): quiet report_flakes $RESULTS_CSV