diff options
| author | Matt Turner <mattst88@gmail.com> | 2021-03-24 22:46:39 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-25 17:31:25 +0000 |
| commit | efd1d5cc59621521a05389e9ab2bff6e4e96aab6 (patch) | |
| tree | 19d4903127288fca846015940818e4fa8f56e810 /.gitlab-ci | |
| parent | 422ad76cca6255895e2fb0b96f20248a2521e3a6 (diff) | |
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9821>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 2 | ||||
| -rwxr-xr-x | .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 |