Now that multiple eventlog files can be generated, upload thyem all. Also, only upload files in user requested an eventlog be generated.
[YOCTO #9884] Signed-off-by: Bill Randle <william.c.ran...@intel.com> --- .../autobuilder/buildsteps/UploadToasterEventlog.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py index ed1cb1c..0fbb899 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py @@ -34,17 +34,23 @@ class UploadToasterEventlog(ShellCommand): self.workerdir=os.path.join(os.path.join(YOCTO_ABBASE, "yocto-worker")) self.buildername=self.getProperty("buildername") self.layerversion_core = self.getProperty("layerversion_core") - self.filepath=os.path.join(os.path.join( - self.workerdir, self.buildername), - "build/build/bitbake_eventlog.json") + try: + self.create_eventlog = self.getProperty("custom_create_eventlog") + except: + self.create_eventlog = "False" - if int(self.layerversion_core) < 5: + if int(self.layerversion_core) < 5 or self.create_eventlog == "False": self.command = "echo 'Skipping Step.'" else: if os.environ.get('TOASTER_UPLOAD_URL') is not None: + self.filepath = os.path.join(os.path.join( + self.workerdir, self.buildername), + "build/build/tmp/log/bitbake_eventlog-*.json") self.toasterserver = str(os.environ.get('TOASTER_UPLOAD_URL')) - self.command = "curl -F eventlog=@" + self.filepath + " " + self.toasterserver + self.command = "for fn in %s; do " % self.filepath + self.command += "curl -F eventlog=@$fn " + self.toasterserver + ";" + self.command += "done" else: self.command = "echo environment var TOASTER_UPLOADURL not set - Step is noop" self.description = ["Uploading toaster data"] -- 2.5.5 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto