Re: [PATCH v2 12/15] CI: Allow example module checking disabling

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 24 Jan 2023 22:45:55 +0200
schrieb Anton Mikanovich <amikan@ilbers.de>:

> If the target do not have example-module package compiled it can fail
> on startvm test currently. Provide internal testsuite API for skipping
> this test.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  testsuite/cibuilder.py | 6 ++++--
>  testsuite/citest.py    | 2 +-
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
> index d229ecb..f373829 100755
> --- a/testsuite/cibuilder.py
> +++ b/testsuite/cibuilder.py
> @@ -209,7 +209,8 @@ class CIBuilder(Test):
>  
>          return env['LAYERDIR_' + layer].strip('"')
>  
> -    def vm_start(self, arch='amd64', distro='buster',
> enforce_pcbios=False):
> +    def vm_start(self, arch='amd64', distro='buster',
> enforce_pcbios=False,
> +                 skip_modulecheck=False):
>          time_to_wait = self.params.get('time_to_wait', default=60)
>  
>          self.log.info('===================================================')
> @@ -291,7 +292,8 @@ class CIBuilder(Test):
>          if os.path.exists(output_file) and
> os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1:
>                  data = f1.read()
> -                if module_output in data and login_prompt in data:
> +                if (module_output in data or skip_modulecheck) \
> +                   and login_prompt in data:

This all looks a little weird to be honest. And will likely be replaced
once we ssh in and "lsmod" anyhow. Maybe we need this in the meantime.

>                      if resize_output:
>                          if resize_output in data:
>                              return
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index 2c17361..1b4336c 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -69,7 +69,7 @@ class DevTest(CIBaseTest):
>  
>      def test_dev_run_arm_bullseye(self):
>          self.init()
> -        self.vm_start('arm', 'bullseye')
> +        self.vm_start('arm', 'bullseye', skip_modulecheck=True)

Not sure why this one does not have or support the module, maybe adding
the module if possible would be better.

Henning
 
>  class ReproTest(CIBaseTest):
>