As per T470, tasks should now be able to provide per-result artifacts. Add the path to the respective artifact file to the CheckDetail result object.
tested by local run
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | upgradepath.py (7 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| b38f3ef35d43 | c5a7a8d4f249 | 0981738ccb24 | Josef Skladanka | Provide per-update/build artifacts in TAP output (Show More…) | Jun 16 2015, 11:40 AM |
| Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s) | 46 | def __init__(self): | |||
|---|---|---|---|---|---|
| 58 | 58 | | |||
| 59 | self.repoinfo = yumrepoinfo.get_yumrepoinfo() | 59 | self.repoinfo = yumrepoinfo.get_yumrepoinfo() | ||
| 60 | self.bodhi = bodhi_utils.BodhiUtils() | 60 | self.bodhi = bodhi_utils.BodhiUtils() | ||
| 61 | 61 | | |||
| 62 | 62 | | |||
| 63 | def store_logs(self): | 63 | def store_logs(self): | ||
| 64 | '''Take ``self.build2detail`` and ``self.update2detail`` and save it as | 64 | '''Take ``self.build2detail`` and ``self.update2detail`` and save it as | ||
| 65 | inidividual log files in ``args.storedir`` directory, provided it is | 65 | inidividual log files in ``args.storedir`` directory, provided it is | ||
| 66 | defined.''' | 66 | defined. | ||
| 67 | Also sets ``artifact`` attribute for the affected details, to point to | ||||
| 68 | the generated artifact file. | ||||
| 69 | ''' | ||||
| 67 | if not args.storedir: | 70 | if not args.storedir: | ||
| 68 | logger.debug('Not writing individual logs, not requested') | 71 | logger.debug('Not writing individual logs, not requested') | ||
| 69 | return | 72 | return | ||
| 70 | 73 | | |||
| 71 | try: | 74 | try: | ||
| 72 | storedir = os.path.abspath(args.storedir) | 75 | storedir = os.path.abspath(args.storedir) | ||
| 73 | logger.debug('Writing individual logs into: %s', storedir) | 76 | logger.debug('Writing individual logs into: %s', storedir) | ||
| 74 | 77 | | |||
| 75 | if not os.path.exists(storedir): | 78 | if not os.path.exists(storedir): | ||
| 76 | os.makedirs(storedir) | 79 | os.makedirs(storedir) | ||
| 77 | 80 | | |||
| 78 | # save build logs | 81 | # save build logs | ||
| 79 | for build, detail in self.build2detail.items(): | 82 | for build, detail in self.build2detail.items(): | ||
| 80 | filename = os.path.join(storedir, build) + '.log' | 83 | filename = os.path.join(storedir, build) + '.log' | ||
| 81 | fout = open(filename, 'w') | 84 | fout = open(filename, 'w') | ||
| 82 | fout.write('\n'.join(detail.output) + '\n') | 85 | fout.write('\n'.join(detail.output) + '\n') | ||
| 83 | fout.close() | 86 | fout.close() | ||
| 87 | detail.artifact = filename | ||||
| 84 | 88 | | |||
| 85 | # save update logs | 89 | # save update logs | ||
| 86 | for update, detail in self.update2detail.items(): | 90 | for update, detail in self.update2detail.items(): | ||
| 87 | filename = os.path.join(storedir, update.update['updateid'] or | 91 | filename = os.path.join(storedir, update.update['updateid'] or | ||
| 88 | update.update['title']) + '.log' | 92 | update.update['title']) + '.log' | ||
| 89 | fout = open(filename, 'w') | 93 | fout = open(filename, 'w') | ||
| 90 | fout.write('\n'.join(detail.output) + '\n') | 94 | fout.write('\n'.join(detail.output) + '\n') | ||
| 91 | fout.close() | 95 | fout.close() | ||
| 96 | detail.artifact = filename | ||||
| 92 | 97 | | |||
| 93 | except OSError as e: | 98 | except OSError as e: | ||
| 94 | logger.error('Individual logs not saved into %s, an error occured. ' | 99 | logger.error('Individual logs not saved into %s, an error occured. ' | ||
| 95 | 'Raising.', args.storedir) | 100 | 'Raising.', args.storedir) | ||
| 96 | raise e | 101 | raise e | ||
| 97 | 102 | | |||
| 98 | 103 | | |||
| 99 | def compare(self, proposed_build, tags, op, tag_builds, check_detail, | 104 | def compare(self, proposed_build, tags, op, tag_builds, check_detail, | ||
| ▲ Show 20 Lines • Show All 577 Lines • Show Last 20 Lines | |||||