gitlab-ci: adapt query_traces_yaml to gitlab specific changes

This change was missing after acf7e73be5 "(gitlab-ci: make explicit
tracie is gitlab specific)".

Fixes: acf7e73be5 "(gitlab-ci: make explicit tracie is gitlab specific)".
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Rohan Garg <rohan.garg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4638>
This commit is contained in:
Andres Gomez 2020-04-20 13:40:05 +03:00
parent 0a884d7304
commit e4521aeafc
2 changed files with 15 additions and 12 deletions

View File

@ -5,13 +5,14 @@ Home of the Mesa trace testing effort.
### Traces definition file
The trace definition file contains information about the git repo/commit to get
the traces from, and a list of the traces to run along with their expected image
checksums on each device. An example:
The trace definition file contains information about the GitLab
project and git commit to get the traces from, and a list of the
traces to run along with their expected image checksums on each
device. An example:
```yaml
traces-db:
repo: https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db
gitlab-project-url: https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db
commit: master
traces:
@ -39,11 +40,12 @@ with the [image_checksum.py](.gitlab-ci/tracie/image_checksum.py) script.
Alternatively, an arbitrary checksum can be used, and during replay (see below)
the scripts will report the mismatch and expected checksum.
### Trace-db repos
### Trace-db GitLab projects
The trace-db repos are assumed to be git repositories using LFS for their trace
files. This is so that trace files can be potentially checked out and replayed
individually, thus reducing storage requirements during CI runs.
The trace-db GitLab projects are assumed to have git repositories
using LFS for their trace files. This is so that trace files can be
potentially checked out and replayed individually, thus reducing
storage requirements during CI runs.
### Enabling trace testing on a new device

View File

@ -1,6 +1,7 @@
#!/usr/bin/python3
# Copyright (c) 2019 Collabora Ltd
# Copyright © 2020 Valve Corporation.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@ -30,10 +31,10 @@ from traceutil import trace_type_from_filename
def trace_devices(trace):
return [e['device'] for e in trace['expectations']]
def cmd_traces_db_repo(args):
def cmd_traces_db_gitlab_project_url(args):
with open(args.file, 'r') as f:
y = yaml.safe_load(f)
print(y['traces-db']['repo'])
print(y['traces-db']['gitlab-project-url'])
def cmd_traces_db_commit(args):
with open(args.file, 'r') as f:
@ -74,8 +75,8 @@ def main():
subparsers = parser.add_subparsers(help='sub-command help')
parser_traces_db_repo = subparsers.add_parser('traces_db_repo')
parser_traces_db_repo.set_defaults(func=cmd_traces_db_repo)
parser_traces_db_gitlab_project_url = subparsers.add_parser('traces_db_gitlab_project_url')
parser_traces_db_gitlab_project_url.set_defaults(func=cmd_traces_db_gitlab_project_url)
parser_traces_db_commit = subparsers.add_parser('traces_db_commit')
parser_traces_db_commit.set_defaults(func=cmd_traces_db_commit)