diff mbox series

[isar-cip-core,v2,2/4] Add dmesg filter needed for lava test result

Message ID 20220120125418.236990-3-alice.ferrazzi@miraclelinux.com (mailing list archive)
State New
Headers show
Series Add cip-core-image-kernelci building and uploading system | expand

Commit Message

Alice Ferrazzi Jan. 20, 2022, 12:54 p.m. UTC
KernelCI is using a dmesg filter script for checking dmesg
logs result with lava.
Adding the script to the cip-core-image-kernelci.

Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
---
 .../kernelci-customizations/files/dmesg.sh    | 23 +++++++++++++++++++
 .../kernelci-customizations.bb                |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh

Comments

Jan Kiszka Jan. 27, 2022, 11:19 a.m. UTC | #1
On 20.01.22 13:54, Alice Ferrazzi wrote:
> KernelCI is using a dmesg filter script for checking dmesg
> logs result with lava.
> Adding the script to the cip-core-image-kernelci.
> 
> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> ---
>   .../kernelci-customizations/files/dmesg.sh    | 23 +++++++++++++++++++
>   .../kernelci-customizations.bb                |  1 +
>   2 files changed, 24 insertions(+)
>   create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
> 
> diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
> new file mode 100644
> index 0000000..3b096e1
> --- /dev/null
> +++ b/recipes-core/kernelci-customizations/files/dmesg.sh
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +
> +set -e
> +
> +if [ "$KERNELCI_LAVA" = "y" ]; then
> +    alias test-result='lava-test-case'
> +else
> +    alias test-result='echo'
> +fi
> +
> +for level in crit alert emerg; do
> +    dmesg --level=$level --notime -x -k > dmesg.$level
> +    test -s dmesg.$level && res=fail || res=pass
> +    count=$(cat dmesg.$level | wc -l)
> +    cat dmesg.$level
> +    test-result \
> +        $level \
> +        --result $res \
> +        --measurement $count \
> +        --units lines
> +done
> +
> +exit 0
> diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> index dca0891..c3f677c 100644
> --- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
> +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> @@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations"
>   SRC_URI = " \
>       file://postinst \
>       file://ethernet \
> +    file://dmesg.sh \
>       file://99-silent-printk.conf"
>   
>   DEPENDS += "sshd-regen-keys"

This is a nop, you forgot to install it.

Where should that script actually end up?

Jan
Alice Ferrazzi Jan. 27, 2022, 1:09 p.m. UTC | #2
On Thu, Jan 27, 2022 at 8:19 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 20.01.22 13:54, Alice Ferrazzi wrote:
> > KernelCI is using a dmesg filter script for checking dmesg
> > logs result with lava.
> > Adding the script to the cip-core-image-kernelci.
> >
> > Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > ---
> >   .../kernelci-customizations/files/dmesg.sh    | 23 +++++++++++++++++++
> >   .../kernelci-customizations.bb                |  1 +
> >   2 files changed, 24 insertions(+)
> >   create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
> >
> > diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
> > new file mode 100644
> > index 0000000..3b096e1
> > --- /dev/null
> > +++ b/recipes-core/kernelci-customizations/files/dmesg.sh
> > @@ -0,0 +1,23 @@
> > +#!/bin/sh
> > +
> > +set -e
> > +
> > +if [ "$KERNELCI_LAVA" = "y" ]; then
> > +    alias test-result='lava-test-case'
> > +else
> > +    alias test-result='echo'
> > +fi
> > +
> > +for level in crit alert emerg; do
> > +    dmesg --level=$level --notime -x -k > dmesg.$level
> > +    test -s dmesg.$level && res=fail || res=pass
> > +    count=$(cat dmesg.$level | wc -l)
> > +    cat dmesg.$level
> > +    test-result \
> > +        $level \
> > +        --result $res \
> > +        --measurement $count \
> > +        --units lines
> > +done
> > +
> > +exit 0
> > diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> > index dca0891..c3f677c 100644
> > --- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
> > +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> > @@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations"
> >   SRC_URI = " \
> >       file://postinst \
> >       file://ethernet \
> > +    file://dmesg.sh \
> >       file://99-silent-printk.conf"
> >
> >   DEPENDS += "sshd-regen-keys"
>
> This is a nop, you forgot to install it.
>
> Where should that script actually end up?

you are right.
The installation script got lost in the rebase.
sending a patch v3

--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
Jan Kiszka Jan. 27, 2022, 3:38 p.m. UTC | #3
On 27.01.22 14:09, Alice Ferrazzi wrote:
> On Thu, Jan 27, 2022 at 8:19 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 20.01.22 13:54, Alice Ferrazzi wrote:
>>> KernelCI is using a dmesg filter script for checking dmesg
>>> logs result with lava.
>>> Adding the script to the cip-core-image-kernelci.
>>>
>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
>>> ---
>>>    .../kernelci-customizations/files/dmesg.sh    | 23 +++++++++++++++++++
>>>    .../kernelci-customizations.bb                |  1 +
>>>    2 files changed, 24 insertions(+)
>>>    create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
>>>
>>> diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
>>> new file mode 100644
>>> index 0000000..3b096e1
>>> --- /dev/null
>>> +++ b/recipes-core/kernelci-customizations/files/dmesg.sh
>>> @@ -0,0 +1,23 @@
>>> +#!/bin/sh
>>> +
>>> +set -e
>>> +
>>> +if [ "$KERNELCI_LAVA" = "y" ]; then
>>> +    alias test-result='lava-test-case'
>>> +else
>>> +    alias test-result='echo'
>>> +fi
>>> +
>>> +for level in crit alert emerg; do
>>> +    dmesg --level=$level --notime -x -k > dmesg.$level
>>> +    test -s dmesg.$level && res=fail || res=pass
>>> +    count=$(cat dmesg.$level | wc -l)
>>> +    cat dmesg.$level
>>> +    test-result \
>>> +        $level \
>>> +        --result $res \
>>> +        --measurement $count \
>>> +        --units lines
>>> +done
>>> +
>>> +exit 0
>>> diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
>>> index dca0891..c3f677c 100644
>>> --- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
>>> +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
>>> @@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations"
>>>    SRC_URI = " \
>>>        file://postinst \
>>>        file://ethernet \
>>> +    file://dmesg.sh \
>>>        file://99-silent-printk.conf"
>>>
>>>    DEPENDS += "sshd-regen-keys"
>>
>> This is a nop, you forgot to install it.
>>
>> Where should that script actually end up?
> 
> you are right.
> The installation script got lost in the rebase.
> sending a patch v3
> 

Found the missing bits:

   install -v -d ${D}/opt/kernelci
   install -v -m 744 ${WORKDIR}/dmesg.sh ${D}/opt/kernelci/

I can add them to your patch if you prefer.

Jan
diff mbox series

Patch

diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
new file mode 100644
index 0000000..3b096e1
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/dmesg.sh
@@ -0,0 +1,23 @@ 
+#!/bin/sh
+
+set -e
+
+if [ "$KERNELCI_LAVA" = "y" ]; then
+    alias test-result='lava-test-case'
+else
+    alias test-result='echo'
+fi
+
+for level in crit alert emerg; do
+    dmesg --level=$level --notime -x -k > dmesg.$level
+    test -s dmesg.$level && res=fail || res=pass
+    count=$(cat dmesg.$level | wc -l)
+    cat dmesg.$level
+    test-result \
+        $level \
+        --result $res \
+        --measurement $count \
+        --units lines
+done
+
+exit 0
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
index dca0891..c3f677c 100644
--- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -18,6 +18,7 @@  DESCRIPTION = "CIP Core image demo & customizations"
 SRC_URI = " \
     file://postinst \
     file://ethernet \
+    file://dmesg.sh \
     file://99-silent-printk.conf"
 
 DEPENDS += "sshd-regen-keys"