MIRRORS/yocto-autobuilder2
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder2.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

steps/runconfig: Avoid storing jsonconfig as a property

Browse Source 
We already have a log, don't duplicate the data as a property as it will
cause excess database growth.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-11-12 10:22:34 +00:00
parent 7898d68ccc
commit 2b497317d2
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
steps/runconfig.py
View File

@ -172,7 +172,15 @@ class RunConfigCheckSteps(shell.ShellCommand):
def evaluateCommand(self, cmd): def evaluateCommand(self, cmd):
# If the command fails, fall back to old style run-config execution # If the command fails, fall back to old style run-config execution
rc = super().evaluateCommand(cmd) rc = super().evaluateCommand(cmd)
jsonconfig = self.getProperty("runconfig-json", None) logLines = self.log_observer_json.getStdout()
json_text = ''.join([line for line in logLines.splitlines()])
jsonconfig = None
if json_text:
try:
jsonconfig = json.loads(json_text)
except Exception as ex:
self._addToLog('stderr', 'ERROR: unable to parse data, exception: {}'.format(ex))
if rc == FAILURE or not jsonconfig: if rc == FAILURE or not jsonconfig:
steps = [get_runconfig_legacy_step(self.posttrigger)] steps = [get_runconfig_legacy_step(self.posttrigger)]
else: else:
@ -186,18 +194,6 @@ class RunConfigCheckSteps(shell.ShellCommand):
self.build.addStepsAfterCurrentStep(steps) self.build.addStepsAfterCurrentStep(steps)
return SUCCESS return SUCCESS
def commandComplete(self, cmd):
super().commandComplete(cmd)
logLines = self.log_observer_json.getStdout()
json_text = ''.join([line for line in logLines.splitlines()])
if not json_text:
return
try:
jsonconfig = json.loads(json_text)
self.setProperty("runconfig-json", jsonconfig)
except Exception as ex:
self._addToLog('stderr', 'ERROR: unable to parse data, exception: {}'.format(ex))
@defer.inlineCallbacks @defer.inlineCallbacks
def _addToLog(self, logName, message): def _addToLog(self, logName, message):
try: try: