1/2] buildbot/steps/transfer.py: Fix typo in DirectoryDownload step.

PATCH In review Aníbal Limón 2 participants 7 messages Jul 11, 2016 – Jul 13, 2016

Share & tools

Aníbal Limón

author

2016-07-11 21:37 UTC #0 lore raw

PATCH 1/1 1/2] buildbot/steps/transfer.py: Fix typo in DirectoryDownload step.

DirectoryDownload step is based on UploadDirectory and i miss to upgrade the error log when the buildslave don't support downloadDirectory previously said uploadDirectory.

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

---
 .../site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/transfer.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/transfer.py +1 -1

index fb49597..a2f7007 100644
@@ -487,7 +487,7 @@ class DirectoryDownload(_TransferBuildStep):
         version = self.slaveVersion("downloadDirectory")
 
         if not version:
-            m = "slave is too old, does not know about uploadDirectory"
+            m = "slave is too old, does not know about downloadDirectory"
             raise BuildSlaveTooOldError(m)
 
         # we rely upon the fact that the buildmaster runs chdir'ed into its

Signature · 1 line

2.1.4

Aníbal Limón

author

2016-07-11 21:37 UTC #1 lore raw

PATCH 1/1 2/2] buildsteps/RunOeSelftest.py: Set native_lsb to universal

The error report is generated into AB master and currently we don't have a method to get AB worker distro, so set to universal.

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

---
 lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +3 -1

index 5b9e408..809bcc3 100644
@@ -52,7 +52,9 @@ class RunOeSelftest(ShellCommand):
         report['machine'] = 'universal'
         report['build_sys'] = "%s-%s" % (platform.machine(),
                 platform.system().lower())
-        report['nativelsb'] = get_lsb_distro() or 'universal'
+        # XXX: Set to universal because isn't easy to get Autobuilder
+        # worker distro.
+        report['nativelsb'] = 'universal' 
         report['distro'] = 'universal'
         report['target_sys'] = 'universal'

Signature · 1 line

2.1.4

Joshua G Lock

2016-07-12 16:09 UTC #2 lore raw

Re: [[PATCH][yocto-autobuilder] 2/2] buildsteps/RunOeSelftest.py: Set native_lsb to universal

Quoted 2 lines · Aníbal Limón

The error report is generated into AB master and currently we don't have a method to get AB worker distro, so set to universal.

Can you elaborate a bit here? Why don't we have a method available to get the worker distro? Is it because we don't ensure all of the builders in the cluster include lsb_release?

Are our worker distro versions new enough that we can rely on os- release?

http://manpages.ubuntu.com/manpages/xenial/en/man5/os-release.5.html

Regards,

Joshua

Quoted 30 lines

Signed-off-by Aníbal Limón <[email protected]>
---
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
packages/autobuilder/buildsteps/RunOeSelftest.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py index 5b9e408..809bcc3 100644
--- a/lib/python2.7/site- packages/autobuilder/buildsteps/RunOeSelftest.py
+++ b/lib/python2.7/site- packages/autobuilder/buildsteps/RunOeSelftest.py
(quoted diff) +0 -0
@@ -52,7 +52,9 @@ class RunOeSelftest(ShellCommand):
         report['machine'] = 'universal' report['build_sys'] = "%s-%s" % (platform.machine(), platform.system().lower())
-        report['nativelsb'] = get_lsb_distro() or 'universal' +        # XXX: Set to universal because isn't easy to get Autobuilder
+        # worker distro.
+        report['nativelsb'] = 'universal' report['distro'] = 'universal' report['target_sys'] = 'universal'

--
2.1.4

Aníbal Limón

author

2016-07-12 16:22 UTC #3 lore raw

Re: [[PATCH][yocto-autobuilder] 2/2] buildsteps/RunOeSelftest.py: Set native_lsb to universal

Quoted 7 lines · Joshua G Lock

Quoted 2 lines · Aníbal Limón
The error report is generated into AB master and currently we don't have a method to get AB worker distro, so set to universal.
Can you elaborate a bit here? Why don't we have a method available to get the worker distro? Is it because we don't ensure all of the builders in the cluster include lsb_release?

Currently, we don't have an easy way to get the worker distro an buildstep is needed in order TODO that but isn't trivial.

I propose to have at step at buildinit for get the worker information. At this time only will be distro. I removed the get_lsb_distro() because it gets the distro of the master instead of the worker.

I added a bug for this task,

https://bugzilla.yoctoproject.org/show_bug.cgi?id=9917

Cheers,
alimon

Quoted 40 lines

Are our worker distro versions new enough that we can rely on os- release?
http://manpages.ubuntu.com/manpages/xenial/en/man5/os-release.5.html
Regards,
Joshua
Quoted 30 lines
Signed-off-by Aníbal Limón <[email protected]>
---
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py
| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
packages/autobuilder/buildsteps/RunOeSelftest.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py index 5b9e408..809bcc3 100644
--- a/lib/python2.7/site- packages/autobuilder/buildsteps/RunOeSelftest.py
+++ b/lib/python2.7/site- packages/autobuilder/buildsteps/RunOeSelftest.py
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +1 -1
@@ -52,7 +52,9 @@ class RunOeSelftest(ShellCommand):
         report['machine'] = 'universal'
         report['build_sys'] = "%s-%s" % (platform.machine(),
                 platform.system().lower())
-        report['nativelsb'] = get_lsb_distro() or 'universal'
+        # XXX: Set to universal because isn't easy to get
Autobuilder
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +2 -0
+        # worker distro.
+        report['nativelsb'] = 'universal' 
         report['distro'] = 'universal'
         report['target_sys'] = 'universal'
Signature · 2 lines
-- 
2.1.4

Joshua G Lock

2016-07-13 13:32 UTC #4 lore raw

Re: [[PATCH][yocto-autobuilder] 2/2] buildsteps/RunOeSelftest.py: Set native_lsb to universal

Quoted 11 lines · Aníbal Limón

Quoted 8 lines · Joshua G Lock
Quoted 2 lines · Aníbal Limón
The error report is generated into AB master and currently we don't have a method to get AB worker distro, so set to universal.
Can you elaborate a bit here? Why don't we have a method available to
get the worker distro? Is it because we don't ensure all of the builders in the cluster include lsb_release?

Quoted 8 lines

Currently, we don't have an easy way to get the worker distro an buildstep is needed in order TODO that but isn't trivial.
I propose to have at step at buildinit for get the worker information.
At this time only will be distro. I removed the get_lsb_distro() because
it gets the distro of the master instead of the worker.

Could we just extract the value of NATIVELSBSTRING[1] from the build header in the logs?

Regards,

Joshua

1. http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#var-
NATIVELSBSTRING

Quoted 53 lines

I added a bug for this task,
https://bugzilla.yoctoproject.org/show_bug.cgi?id=9917
Cheers,
alimon
Quoted 43 lines
Are our worker distro versions new enough that we can rely on os- release?
http://manpages.ubuntu.com/manpages/xenial/en/man5/os-release.5.htm
l
Regards,
Joshua
Quoted 32 lines
Signed-off-by Aníbal Limón <[email protected]>
---
lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
Quoted 1 line
4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
packages/autobuilder/buildsteps/RunOeSelftest.py
b/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
index 5b9e408..809bcc3 100644
--- a/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
+++ b/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
(quoted diff) +0 -0
@@ -52,7 +52,9 @@ class RunOeSelftest(ShellCommand):
         report['machine'] = 'universal' report['build_sys'] = "%s-%s" % (platform.machine(), platform.system().lower())
-        report['nativelsb'] = get_lsb_distro() or 'universal' +        # XXX: Set to universal because isn't easy to get Autobuilder
+        # worker distro.
+        report['nativelsb'] = 'universal' report['distro'] = 'universal' report['target_sys'] = 'universal'

--
2.1.4

Aníbal Limón

author

2016-07-13 15:11 UTC #5 lore raw

Re: [[PATCH][yocto-autobuilder] 2/2] buildsteps/RunOeSelftest.py: Set native_lsb to universal

Quoted 15 lines · Joshua G Lock

Quoted 14 lines · Aníbal Limón
Quoted 8 lines · Joshua G Lock
Quoted 2 lines · Aníbal Limón
The error report is generated into AB master and currently we don't have a method to get AB worker distro, so set to universal.
Can you elaborate a bit here? Why don't we have a method available to
get the worker distro? Is it because we don't ensure all of the builders in the cluster include lsb_release?
Currently, we don't have an easy way to get the worker distro an buildstep is needed in order TODO that but isn't trivial.

Quoted 8 lines

Quoted 5 lines
I propose to have at step at buildinit for get the worker information.
At this time only will be distro. I removed the get_lsb_distro() because
it gets the distro of the master instead of the worker.
Could we just extract the value of NATIVELSBSTRING[1] from the build header in the logs?

I use this value in the BuildImages steps because bitbake builds an image an print that information but for the oe-selftest isn't available because it executes a different tests suites maybe or not using bitbake.

alimon

Quoted 61 lines

Regards,
Joshua
1. http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#var-
NATIVELSBSTRING
Quoted 53 lines
I added a bug for this task,
https://bugzilla.yoctoproject.org/show_bug.cgi?id=9917
Cheers,
alimon
Quoted 43 lines
Are our worker distro versions new enough that we can rely on os- release?
http://manpages.ubuntu.com/manpages/xenial/en/man5/os-release.5.htm
l
Regards,
Joshua
Quoted 32 lines
Signed-off-by Aníbal Limón <[email protected]>
---
lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
Quoted 1 line
4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
packages/autobuilder/buildsteps/RunOeSelftest.py
b/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
index 5b9e408..809bcc3 100644
--- a/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
+++ b/lib/python2.7/site-
packages/autobuilder/buildsteps/RunOeSelftest.py
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +1 -1
@@ -52,7 +52,9 @@ class RunOeSelftest(ShellCommand):
         report['machine'] = 'universal'
         report['build_sys'] = "%s-%s" % (platform.machine(),
                 platform.system().lower())
-        report['nativelsb'] = get_lsb_distro() or 'universal'
+        # XXX: Set to universal because isn't easy to get
Autobuilder
lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +2 -0
+        # worker distro.
+        report['nativelsb'] = 'universal' 
         report['distro'] = 'universal'
         report['target_sys'] = 'universal'
Signature · 2 lines
-- 
2.1.4

Joshua G Lock

2016-07-13 15:20 UTC #6 lore raw

In reply to Aníbal Limón

This and the 2/2 have been pushed to master, thanks.

Joshua

Quoted 33 lines · Aníbal Limón

DirectoryDownload step is based on UploadDirectory and i miss to upgrade the error log when the buildslave don't support downloadDirectory previously said uploadDirectory.
Signed-off-by Aníbal Limón <[email protected]>
---
.../site-packages/buildbot-0.8.8-
py2.7.egg/buildbot/steps/transfer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
py2.7.egg/buildbot/steps/transfer.py b/lib/python2.7/site- packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/transfer.py index fb49597..a2f7007 100644
--- a/lib/python2.7/site-packages/buildbot-0.8.8- py2.7.egg/buildbot/steps/transfer.py
+++ b/lib/python2.7/site-packages/buildbot-0.8.8- py2.7.egg/buildbot/steps/transfer.py
lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/transfer.py +0 -0
@@ -487,7 +487,7 @@ class DirectoryDownload(_TransferBuildStep):
          version = self.slaveVersion("downloadDirectory")
         if not version:
-            m = "slave is too old, does not know about uploadDirectory"
+            m = "slave is too old, does not know about downloadDirectory"
             raise BuildSlaveTooOldError(m)
         # we rely upon the fact that the buildmaster runs chdir'ed
into its
-- 
2.1.4