particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

also use in appliance/livecd/liveimage

Browse source
This commit is contained in:
Mike McLean 2023-10-19 16:55:04 -04:00 • committed by Tomas Kopecek
parent c08b3fd042
commit 27160b1a58
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
builder/kojid
View file

@ -3427,13 +3427,13 @@ class ApplianceTask(ImageTask):
self.logger.debug('output: %s' % results)
if len(results) == 0:
raise koji.ApplianceError("Could not find image build results!")
logs = ['appliance.log', os.path.basename(ksfile), os.path.basename(kskoji)]
logs.extend(broot.logs)
imgdata = {
'arch': arch,
'rootdev': self.getRootDevice(),
'task_id': self.id,
'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
'appliance.log', os.path.basename(ksfile),
os.path.basename(kskoji)],
'logs': logs,
'name': name,
'version': version,
'release': release
@ -3599,13 +3599,13 @@ class LiveCDTask(ImageTask):
self.uploadFile(manifest)
self.uploadFile(isosrc, remoteName=isoname)
logs = ['livecd.log', os.path.basename(ksfile), os.path.basename(kskoji)]
logs.extend(broot.logs)
imgdata = {'arch': arch,
'files': [isoname],
'rootdev': None,
'task_id': self.id,
'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
'livecd.log', os.path.basename(ksfile),
os.path.basename(kskoji)],
'logs': logs,
'name': name,
'version': version,
'release': release
@ -3854,13 +3854,13 @@ class LiveMediaTask(ImageTask):
self.logger.debug('uploading image: %s' % isosrc)
self.uploadFile(isosrc, remoteName=isoname)
logs = ['livemedia-out.log', os.path.basename(ksfile), os.path.basename(kskoji)]
logs.extend(broot.logs)
imgdata = {'arch': arch,
'files': [isoname],
'rootdev': None,
'task_id': self.id,
'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
'livemedia-out.log', os.path.basename(ksfile),
os.path.basename(kskoji)],
'logs': logs,
'name': name,
'version': version,
'release': release