All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCHv2][yocto-autobuilder] lib/buildsteps.py: fix report creation in nigthly-oecore
@ 2016-07-29 16:13 Aníbal Limón
  2016-08-02  6:28 ` Beth 'pidge' Flanagan
  0 siblings, 1 reply; 2+ messages in thread
From: Aníbal Limón @ 2016-07-29 16:13 UTC (permalink / raw)
  To: yocto; +Cc: joshua.g.lock

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 <anibal.limon@linux.intel.com>
---
 lib/python2.7/site-packages/autobuilder/lib/buildsteps.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py b/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py
index eee0c1b..f7b1921 100644
--- a/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py
+++ b/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py
@@ -118,8 +118,15 @@ class BitbakeShellCommand(ShellCommand):
         report['target_sys'] = vrs['TARGET_SYS']
 
         report['component'] = 'bitbake'
-        report['branch_commit'] = self.getProperty('branch') + ': ' + \
-                self.getProperty('got_revision')
+        try:
+            branch = self.getProperty('branch')
+            revision = self.getProperty('got_revision')
+            if not revision:
+                revision = self.getProperty('got_revision_oecore')
+        except:
+            branch = "unknown_branch"
+            revision = "unknown_revision"
+        report['branch_commit'] = branch + ': ' + revision
 
         failure = {}
         failure['package'] = "bitbake-%s" % vrs['BB_VERSION']
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCHv2][yocto-autobuilder] lib/buildsteps.py: fix report creation in nigthly-oecore
  2016-07-29 16:13 [PATCHv2][yocto-autobuilder] lib/buildsteps.py: fix report creation in nigthly-oecore Aníbal Limón
@ 2016-08-02  6:28 ` Beth 'pidge' Flanagan
  0 siblings, 0 replies; 2+ messages in thread
From: Beth 'pidge' Flanagan @ 2016-08-02  6:28 UTC (permalink / raw)
  To: Aníbal Limón, yocto; +Cc: joshua.g.lock

On Fri, 2016-07-29 at 11:13 -0500, Aníbal Limón wrote:
> nightly-oecore buildset doesn't prove got_revision property
> so when got_revision is None use got_revision_oecore instead.
> 

pulled into master, thanks!

-b

> [YOCTO #10051]
> 
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> ---
>  lib/python2.7/site-packages/autobuilder/lib/buildsteps.py | 11
> +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/python2.7/site-
> packages/autobuilder/lib/buildsteps.py b/lib/python2.7/site-
> packages/autobuilder/lib/buildsteps.py
> index eee0c1b..f7b1921 100644
> --- a/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py
> +++ b/lib/python2.7/site-packages/autobuilder/lib/buildsteps.py
> @@ -118,8 +118,15 @@ class BitbakeShellCommand(ShellCommand):
>          report['target_sys'] = vrs['TARGET_SYS']
>  
>          report['component'] = 'bitbake'
> -        report['branch_commit'] = self.getProperty('branch') + ': '
> + \
> -                self.getProperty('got_revision')
> +        try:
> +            branch = self.getProperty('branch')
> +            revision = self.getProperty('got_revision')
> +            if not revision:
> +                revision = self.getProperty('got_revision_oecore')
> +        except:
> +            branch = "unknown_branch"
> +            revision = "unknown_revision"
> +        report['branch_commit'] = branch + ': ' + revision
>  
>          failure = {}
>          failure['package'] = "bitbake-%s" % vrs['BB_VERSION']


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-08-02  6:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-29 16:13 [PATCHv2][yocto-autobuilder] lib/buildsteps.py: fix report creation in nigthly-oecore Aníbal Limón
2016-08-02  6:28 ` Beth 'pidge' Flanagan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.