[PATCH yocto-autobuilder-helper] scripts/collect-results: publish everything in tmp/log/oeqa/

[PATCH yocto-autobuilder-helper] scripts/collect-results: publish everything in tmp/log/oeqa/

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

In addition to the testresult json, testimage class now also
provides the testimage task log and qemu console output log
which can be useful for debugging test failures or
even checking qemu test runs when failures did not happen.

Rather than duplicate specific file/folder names, let's copy all
that is available, and define what is published in the testimage
class itself (with appropriate folder structure if/when needed).
At the moment there's just three files, and they are copied into
folders named after image names, so there's no clutter or risk
of mixing them up with unrelated logs.

[YOCTO #14518]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 scripts/collect-results | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/collect-results b/scripts/collect-results
index 93834d6..3663330 100755
--- a/scripts/collect-results
+++ b/scripts/collect-results
@@ -3,11 +3,9 @@ WORKDIR=$1
 DEST=$2
 target=$3
 
-RESFILE=$WORKDIR/tmp/log/oeqa/testresults.json 
-
-if [ -e $RESFILE ]; then
-    mkdir -p $DEST/$target
-    cp $WORKDIR/tmp/log/oeqa/testresults.json  $DEST/$target/
+mkdir -p $DEST
+if [ -e $WORKDIR/tmp/log/oeqa/ ]; then
+    cp -rf $WORKDIR/tmp/log/oeqa/ $DEST/$target
 fi
 
 if [ -e $WORKDIR/buildhistory ]; then
-- 
2.31.1

Re: [yocto] [PATCH yocto-autobuilder-helper] scripts/collect-results: publish everything in tmp/log/oeqa/

[Richard Purdie]

On Wed, 2021-10-13 at 18:18 +0200, Alexander Kanavin wrote:
> From: Alexander Kanavin <alex@linutronix.de>
> 
> In addition to the testresult json, testimage class now also
> provides the testimage task log and qemu console output log
> which can be useful for debugging test failures or
> even checking qemu test runs when failures did not happen.
> 
> Rather than duplicate specific file/folder names, let's copy all
> that is available, and define what is published in the testimage
> class itself (with appropriate folder structure if/when needed).
> At the moment there's just three files, and they are copied into
> folders named after image names, so there's no clutter or risk
> of mixing them up with unrelated logs.
> 
> [YOCTO #14518]
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  scripts/collect-results | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/collect-results b/scripts/collect-results
> index 93834d6..3663330 100755
> --- a/scripts/collect-results
> +++ b/scripts/collect-results
> @@ -3,11 +3,9 @@ WORKDIR=$1
>  DEST=$2
>  target=$3
>  
> -RESFILE=$WORKDIR/tmp/log/oeqa/testresults.json 
> -
> -if [ -e $RESFILE ]; then
> -    mkdir -p $DEST/$target
> -    cp $WORKDIR/tmp/log/oeqa/testresults.json  $DEST/$target/
> +mkdir -p $DEST
> +if [ -e $WORKDIR/tmp/log/oeqa/ ]; then
> +    cp -rf $WORKDIR/tmp/log/oeqa/ $DEST/$target
>  fi
>  

Since that build directory contains symlinks, we may need something like cp -L
here? I didn't test but I think we might run into an issue?

Cheers,

Richard

Re: [yocto] [PATCH yocto-autobuilder-helper] scripts/collect-results: publish everything in tmp/log/oeqa/

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

On Thu, 14 Oct 2021 at 18:08, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Since that build directory contains symlinks, we may need something like
> cp -L
> here? I didn't test but I think we might run into an issue?
>

That's right, -L is needed.

Alex

[-- Attachment #2: Type: text/html, Size: 624 bytes --]