diff mbox series

[buildroot-test,v2] scripts/autobuild-run: create host-distro file

Message ID 20200914204101.16172-1-heiko.thiery@gmail.com
State Accepted
Headers show
Series [buildroot-test,v2] scripts/autobuild-run: create host-distro file | expand

Commit Message

Heiko Thiery Sept. 14, 2020, 8:41 p.m. UTC
Sometimes autobuilder failures occur only on a specific distribution. To
ease the research for the maintainer/developers add the host distribution
information to the result archive.

The distribution information comes from '/etc/os-release' (or
'/usr/lib/os-release') that seems to be present on the most common distros:

Debian: https://manpages.debian.org/buster/systemd/os-release.5.en.html
Ubuntu: http://manpages.ubuntu.com/manpages/bionic/man5/os-release.5.html
Red Red: https://www.freedesktop.org/software/systemd/man/os-release.html
Open-Suse: https://en.opensuse.org/SDB:Find_openSUSE_version

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
v2:
 - implement comments from Yann
 - copy the whole file (os-release) as host-distro to the result archive
 - reword the commit log

---
 scripts/autobuild-run | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Yann E. MORIN Sept. 14, 2020, 8:52 p.m. UTC | #1
Heiko, Thomas, All,

On 2020-09-14 22:41 +0200, Heiko Thiery spake thusly:
> Sometimes autobuilder failures occur only on a specific distribution. To
> ease the research for the maintainer/developers add the host distribution
> information to the result archive.
> 
> The distribution information comes from '/etc/os-release' (or
> '/usr/lib/os-release') that seems to be present on the most common distros:
> 
> Debian: https://manpages.debian.org/buster/systemd/os-release.5.en.html
> Ubuntu: http://manpages.ubuntu.com/manpages/bionic/man5/os-release.5.html
> Red Red: https://www.freedesktop.org/software/systemd/man/os-release.html
> Open-Suse: https://en.opensuse.org/SDB:Find_openSUSE_version
> 
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>

Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> v2:
>  - implement comments from Yann
>  - copy the whole file (os-release) as host-distro to the result archive
>  - reword the commit log
> 
> ---
>  scripts/autobuild-run | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/scripts/autobuild-run b/scripts/autobuild-run
> index f657d49..d4644d6 100755
> --- a/scripts/autobuild-run
> +++ b/scripts/autobuild-run
> @@ -699,6 +699,23 @@ class Builder:
>          with open(os.path.join(self.resultdir, "submitter"), "w+") as submitterf:
>              submitterf.write(self.submitter)
>  
> +        def get_os_release_path():
> +            for p in ['/etc/os-release', '/usr/lib/os-release']:
> +                if os.path.exists(p):
> +                    return p
> +            return None
> +
> +        def save_host_distro_info():
> +            host_distro = os.path.join(self.resultdir, "host-distro")
> +            os_release = get_os_release_path()
> +            if os_release is None:
> +                with open(host_distro, "w") as f:
> +                    f.write('Unknown')
> +            else:
> +                shutil.copyfile(os_release, host_distro)
> +
> +        save_host_distro_info()
> +
>          # Yes, shutil.make_archive() would be nice, but it doesn't exist
>          # in Python 2.6.
>          ret = subprocess.call(["tar", "cjf", "results.tar.bz2", "results"],
> -- 
> 2.20.1
>
Heiko Thiery Oct. 1, 2020, 1:17 p.m. UTC | #2
Hi Yann, Hi Thomas,

Am Mo., 14. Sept. 2020 um 22:52 Uhr schrieb Yann E. MORIN
<yann.morin.1998@free.fr>:
>
> Heiko, Thomas, All,
>
> On 2020-09-14 22:41 +0200, Heiko Thiery spake thusly:
> > Sometimes autobuilder failures occur only on a specific distribution. To
> > ease the research for the maintainer/developers add the host distribution
> > information to the result archive.
> >
> > The distribution information comes from '/etc/os-release' (or
> > '/usr/lib/os-release') that seems to be present on the most common distros:
> >
> > Debian: https://manpages.debian.org/buster/systemd/os-release.5.en.html
> > Ubuntu: http://manpages.ubuntu.com/manpages/bionic/man5/os-release.5.html
> > Red Red: https://www.freedesktop.org/software/systemd/man/os-release.html
> > Open-Suse: https://en.opensuse.org/SDB:Find_openSUSE_version
> >
> > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
>
> Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>

I'm hunting an issue with building libnetconf2 in autobuilder [1].
Meanwhile I think I figured out the issue. But it would be great to
know the host system and version used by the autobuilder. Any chance
to get this patch in?

[1] http://autobuild.buildroot.net/results/2be8b4c60a618ab58590c1fe2d470efa06f6460f/
[2] http://autobuild.buildroot.net/results/bc494a109899f423293d079ae817e69dc52b809e/

--
Heiko
Thomas Petazzoni Oct. 25, 2020, 2:57 p.m. UTC | #3
On Mon, 14 Sep 2020 22:41:02 +0200
Heiko Thiery <heiko.thiery@gmail.com> wrote:

> Sometimes autobuilder failures occur only on a specific distribution. To
> ease the research for the maintainer/developers add the host distribution
> information to the result archive.
> 
> The distribution information comes from '/etc/os-release' (or
> '/usr/lib/os-release') that seems to be present on the most common distros:
> 
> Debian: https://manpages.debian.org/buster/systemd/os-release.5.en.html
> Ubuntu: http://manpages.ubuntu.com/manpages/bionic/man5/os-release.5.html
> Red Red: https://www.freedesktop.org/software/systemd/man/os-release.html
> Open-Suse: https://en.opensuse.org/SDB:Find_openSUSE_version
> 
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
> ---
> v2:
>  - implement comments from Yann
>  - copy the whole file (os-release) as host-distro to the result archive
>  - reword the commit log

Applied to buildroot-test. Thanks!

Thomas
diff mbox series

Patch

diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index f657d49..d4644d6 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -699,6 +699,23 @@  class Builder:
         with open(os.path.join(self.resultdir, "submitter"), "w+") as submitterf:
             submitterf.write(self.submitter)
 
+        def get_os_release_path():
+            for p in ['/etc/os-release', '/usr/lib/os-release']:
+                if os.path.exists(p):
+                    return p
+            return None
+
+        def save_host_distro_info():
+            host_distro = os.path.join(self.resultdir, "host-distro")
+            os_release = get_os_release_path()
+            if os_release is None:
+                with open(host_distro, "w") as f:
+                    f.write('Unknown')
+            else:
+                shutil.copyfile(os_release, host_distro)
+
+        save_host_distro_info()
+
         # Yes, shutil.make_archive() would be nice, but it doesn't exist
         # in Python 2.6.
         ret = subprocess.call(["tar", "cjf", "results.tar.bz2", "results"],