mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-02-22 12:58:36 +00:00
fw/DatabaseOutput: Fix the retrieval of job level artifacts
This commit is contained in:
parent
98b787e326
commit
0ff6b4842a
@ -930,8 +930,10 @@ class DatabaseOutput(Output):
|
|||||||
tables = ['largeobjects', 'artifacts']
|
tables = ['largeobjects', 'artifacts']
|
||||||
joins = [('classifiers', 'classifiers.artifact_oid = artifacts.oid')]
|
joins = [('classifiers', 'classifiers.artifact_oid = artifacts.oid')]
|
||||||
conditions = ['artifacts.{}_oid = \'{}\''.format(self.kind, self.oid),
|
conditions = ['artifacts.{}_oid = \'{}\''.format(self.kind, self.oid),
|
||||||
'artifacts.large_object_uuid = largeobjects.oid',
|
'artifacts.large_object_uuid = largeobjects.oid']
|
||||||
'artifacts.job_oid IS NULL']
|
# If retrieving run level artifacts we want those that don't also belong to a job
|
||||||
|
if self.kind == 'run':
|
||||||
|
conditions.append('artifacts.job_oid IS NULL')
|
||||||
pod = self._read_db(columns, tables, conditions, joins)
|
pod = self._read_db(columns, tables, conditions, joins)
|
||||||
for artifact in pod:
|
for artifact in pod:
|
||||||
artifact['path'] = str(artifact['path'])
|
artifact['path'] = str(artifact['path'])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user