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 | depcheck/squash_results.py (8 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 15d61b4f0130 | f95b4ec0078a | bc85f51d401b | Josef Skladanka | Provide per-update/build artifacts in TAP output (Show More…) | Jun 16 2015, 11:41 AM |
| Show First 20 Lines • Show All 135 Lines • ▼ Show 20 Line(s) | 134 | if 'updates' in report_format: | |||
|---|---|---|---|---|---|
| 136 | results.extend(update_results) | 136 | results.extend(update_results) | ||
| 137 | 137 | | |||
| 138 | # remove the arch conversion to be consistent with cmdline arch | 138 | # remove the arch conversion to be consistent with cmdline arch | ||
| 139 | if arch == 'i686': | 139 | if arch == 'i686': | ||
| 140 | arch = 'i386' | 140 | arch = 'i386' | ||
| 141 | for result in results: | 141 | for result in results: | ||
| 142 | result.keyvals['arch'] = arch | 142 | result.keyvals['arch'] = arch | ||
| 143 | 143 | | |||
| 144 | store_artifacts(results, artifactsdir) | ||||
| 144 | output = check.export_TAP(results, checkname='depcheck') | 145 | output = check.export_TAP(results, checkname='depcheck') | ||
| 145 | 146 | | |||
| 146 | store_artifacts(results, artifactsdir) | | |||
| 147 | else: | 147 | else: | ||
| 148 | output = json.dumps(run_result, indent=4, separators=(',', ': ')) | 148 | output = json.dumps(run_result, indent=4, separators=(',', ': ')) | ||
| 149 | 149 | | |||
| 150 | return output | 150 | return output | ||
| 151 | 151 | | |||
| 152 | def store_artifacts(results, artifactsdir=None): | 152 | def store_artifacts(results, artifactsdir=None): | ||
| 153 | '''Take a list of CheckDetails and save it as inidividual log files in | 153 | '''Take a list of CheckDetails and save it as inidividual log files in | ||
| 154 | the artifactsdir directory, provided it is defined.''' | 154 | the artifactsdir directory, provided it is defined. | ||
| 155 | The method also sets the artifact attribute for each result item as | ||||
| 156 | a side effect. | ||||
| 157 | ''' | ||||
| 155 | 158 | | |||
| 156 | if not artifactsdir: | 159 | if not artifactsdir: | ||
| 157 | log.logger.debug('Not writing individual logs, not requested') | 160 | log.logger.debug('Not writing individual logs, not requested') | ||
| 158 | return | 161 | return | ||
| 159 | 162 | | |||
| 160 | try: | 163 | try: | ||
| 161 | storedir = os.path.abspath(artifactsdir) | 164 | storedir = os.path.abspath(artifactsdir) | ||
| 162 | log.logger.debug('Writing individual logs into: %s', storedir) | 165 | log.logger.debug('Writing individual logs into: %s', storedir) | ||
| 163 | 166 | | |||
| 164 | if not os.path.exists(storedir): | 167 | if not os.path.exists(storedir): | ||
| 165 | os.makedirs(storedir) | 168 | os.makedirs(storedir) | ||
| 166 | 169 | | |||
| 167 | # save logs | 170 | # save logs | ||
| 168 | for result in results: | 171 | for result in results: | ||
| 169 | filename = "%s.%s.log" % (os.path.join(storedir, result.item), result.keyvals['arch']) | 172 | filename = "%s.%s.log" % (os.path.join(storedir, result.item), result.keyvals['arch']) | ||
| 170 | fout = open(filename, 'w') | 173 | fout = open(filename, 'w') | ||
| 171 | fout.write(check.export_TAP([result], checkname='depcheck')) | 174 | fout.write(check.export_TAP([result], checkname='depcheck')) | ||
| 172 | fout.close() | 175 | fout.close() | ||
| 176 | result.artifact = filename | ||||
| 173 | 177 | | |||
| 174 | except OSError as e: | 178 | except OSError as e: | ||
| 175 | log.logger.error('Individual logs not saved into %s, an error occured. ' | 179 | log.logger.error('Individual logs not saved into %s, an error occured. ' | ||
| 176 | 'Raising.', artifactsdir) | 180 | 'Raising.', artifactsdir) | ||
| 177 | raise e | 181 | raise e | ||
| 178 | 182 | | |||