gitlab-ci: Fix traces caching in tracie

We are currently comparing a hex string representation of the git lfs
OID with a byte array representation of the locally calculated OID,
causing detection of valid cached traces to fail. Ensure we are
comparing compatible representations (in this case hex strings).

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>
This commit is contained in:
Alexandros Frantzis
2020-03-24 16:34:05 +02:00
parent efdce97e4b
commit 05069e1f07

View File

@@ -86,7 +86,7 @@ def checksum(filename, hash_factory=hashlib.sha256, chunk_num_blocks=128):
with open(filename,'rb') as f:
for chunk in iter(lambda: f.read(chunk_num_blocks*h.block_size), b''):
h.update(chunk)
return h.digest()
return h.hexdigest()
def ensure_trace(repo_url, repo_commit, trace):
trace_path = TRACES_DB_PATH + trace['path']