Commit 803a1218 authored by Alexandros Frantzis's avatar Alexandros Frantzis

Don't use a submodule for the traces-db repo

Don't use a submodule for the traces-db repo, clone it explicitly
instead, to make the dependency more transparent. The repo and commit
used can be set with the TRACES_DB_REPO and TRACES_DB_COMMIT CI
variables. Do a full clone so that we can checkout arbitrary commits.
Signed-off-by: Alexandros Frantzis's avatarAlexandros Frantzis <alexandros.frantzis@collabora.com>
parent bd564be7
......@@ -109,9 +109,12 @@ conformance:
stage: test
dependencies:
- mesa-build
variables:
TRACES_DB_REPO: "https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db"
TRACES_DB_COMMIT: "1283137e557c9db09c55c9e91aee0ea9926e9b1a"
before_script:
- git submodule sync --recursive
- git submodule update --init --recursive --depth 1
- git clone "$TRACES_DB_REPO" traces-db
- (cd traces-db; git checkout "$TRACES_DB_COMMIT")
- export DISPLAY=:0
- export LIBGL_ALWAYS_SOFTWARE=1
- export GALLIUM_DRIVER=softpipe
......@@ -121,7 +124,7 @@ conformance:
- bash $CI_PROJECT_DIR/scripts/setup-x.sh
- export PYTHONPATH=/usr/local/lib/$(py3versions -d)/site-packages # Required for renderdoc
script:
- cd $CI_PROJECT_DIR/repos/traces-db
- cd $CI_PROJECT_DIR/traces-db
- python3 $CI_PROJECT_DIR/scripts/dump_trace_images.py .
- python3 $CI_PROJECT_DIR/scripts/diff_trace_images.py . $CI_PROJECT_DIR/results
- python3 $CI_PROJECT_DIR/scripts/replay_trace_fps.py .
......
......@@ -31,15 +31,17 @@ CI runs by setting the `MESA_COMMIT` and `MESA_REPO` variables.
### Traces
The traces are held in a separate git repository, which is imported in the Mesa
CI repository as a submodule under `repos/traces-db`.
The traces are held in a separate git repository, which is cloned during CI
testing:
Use `git submodule --init --depth 1` from the Mesa CI repo root directory to get
the traces.
https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db
Each trace is accompanied by a set of reference images in a subdirectory named
`references`. The reference images are of the form `tracefilename-callnum.png`.
The repository and commit to use for traces-db can be overriden in manual
CI runs by using the `TRACES_DB_REPO` and `TRACES_DB_COMMIT` CI variables.
### Replaying traces
Mesa CI uses a set of scripts to replay traces and check the output against the
......
Subproject commit 1283137e557c9db09c55c9e91aee0ea9926e9b1a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment