Skip to contentSkip to conversation

lib/buildsteps.py: fix report creation in nigthly-oecore

PATCH Superseded Aníbal Limón 2 participants 6 messages Jul 29, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Aníbal Limón

author
#0 lore raw

PATCH 1/1 lib/buildsteps.py: fix report creation in nigthly-oecore

nightly-oecore buildset doesn't prove got_revision property so when got_revision is None use got_revision_oecore instead.

[YOCTO #10051]

Signed-off-by Aníbal Limón <[email protected]>
---
 lib/python2.7/site-packages/autobuilder/lib/buildsteps.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
lib/python2.7/site-packages/autobuilder/lib/buildsteps.py +5 -2
index eee0c1b..37ac8b0 100644
@@ -118,8 +118,11 @@ class BitbakeShellCommand(ShellCommand):
         report['target_sys'] = vrs['TARGET_SYS']
 
         report['component'] = 'bitbake'
-        report['branch_commit'] = self.getProperty('branch') + ': ' + \
-                self.getProperty('got_revision')
+        branch = self.getProperty('branch')
+        revision = self.getProperty('got_revision')
+        if not revision:
+            revision = self.getProperty('got_revision_oecore')
+        report['branch_commit'] = branch + ': ' + revision
 
         failure = {}
         failure['package'] = "bitbake-%s" % vrs['BB_VERSION']
Signature · 1 line
2.1.4
author
#1 lore raw

+ beth

Quoted 29 lines · Aníbal Limón

nightly-oecore buildset doesn't prove got_revision property so when got_revision is None use got_revision_oecore instead.

[YOCTO #10051]

Signed-off-by Aníbal Limón <[email protected]>
---
 lib/python2.7/site-packages/autobuilder/lib/buildsteps.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
lib/python2.7/site-packages/autobuilder/lib/buildsteps.py +5 -2
index eee0c1b..37ac8b0 100644
@@ -118,8 +118,11 @@ class BitbakeShellCommand(ShellCommand):
         report['target_sys'] = vrs['TARGET_SYS']
 
         report['component'] = 'bitbake'
-        report['branch_commit'] = self.getProperty('branch') + ': ' + \
-                self.getProperty('got_revision')
+        branch = self.getProperty('branch')
+        revision = self.getProperty('got_revision')
+        if not revision:
+            revision = self.getProperty('got_revision_oecore')
+        report['branch_commit'] = branch + ': ' + revision
 
         failure = {}
         failure['package'] = "bitbake-%s" % vrs['BB_VERSION']
#2 lore raw
In reply to Aníbal Limón
Quoted 21 lines · Aníbal Limón

nightly-oecore buildset doesn't prove got_revision property so when got_revision is None use got_revision_oecore instead.

[YOCTO #10051]

Signed-off-by Aníbal Limón <[email protected]>

---
 lib/python2.7/site-packages/autobuilder/lib/buildsteps.py | 7 +++++- -

 1 file changed, 5 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

packages/autobuilder/lib/buildsteps.py b/lib/python2.7/site- packages/autobuilder/lib/buildsteps.py
index eee0c1b..37ac8b0 100644

lib/python2.7/site-packages/autobuilder/lib/buildsteps.py +0 -0
@@ -118,8 +118,11 @@ class BitbakeShellCommand(ShellCommand):

         report['target_sys'] = vrs['TARGET_SYS']

         report['component'] = 'bitbake'

Quoted 9 lines

-        report['branch_commit'] = self.getProperty('branch') + ': '
+ \
-                self.getProperty('got_revision')
+        branch = self.getProperty('branch')
+        revision = self.getProperty('got_revision')
+        if not revision:
+            revision = self.getProperty('got_revision_oecore') +        report['branch_commit'] = branch + ': ' + revision

I'd put this in a try except. What happens with eclipse?

-b

Quoted 6 lines


         failure = {}
         failure['package'] = "bitbake-%s" % vrs['BB_VERSION'] --
2.1.4

author
#3 lore raw
Quoted 1 line · Beth 'pidge' Flanagan

I'd put this in a try except. What happens with eclipse?

At this time we don't support eclipse, i'll add the try except and if fails use "unknown_branch: unknown_revision".

alimon

#4 lore raw
Quoted 9 lines · Aníbal Limón
Quoted 2 lines · Beth 'pidge' Flanagan

I'd put this in a try except. What happens with eclipse?

At this time we don't support eclipse, i'll add the try except and if fails use "unknown_branch: unknown_revision".

alimon

Ah, some of us still build for it! :D Remember, we try to not break stuff we still support.

-b

author
#5 lore raw
Quoted 5 lines · Beth 'pidge' Flanagan
Quoted 4 lines · Aníbal Limón
Quoted 2 lines · Beth 'pidge' Flanagan

I'd put this in a try except. What happens with eclipse?

Quoted 8 lines
Quoted 5 lines

At this time we don't support eclipse, i'll add the try except and if fails use "unknown_branch: unknown_revision".

alimon

Ah, some of us still build for it! :D Remember, we try to not break stuff we still support.

Yes right, may be i don't exaplain correctly this functionality is for generate error reports the eclipse buildsets are supported but atm don't have error report functionality, i could add later. :D

alimon

Quoted 3 lines

-b