Re: [PATCH 02/11] testsuite: Allow custom image names in start_vm.py

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

Am Fri, 13 Jan 2023 08:19:33 +0100
schrieb Uladzimir Bely <ubely@ilbers.de>:

> This removes hardcoded `isar-image-base` image name used in
> `testsuite/start_vm.py`.
> 
> Now, user can pass custom value with `-i` or `--image` option
> (e.g. `isar-image-debug` or any other value used in their downstream.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  testsuite/cibuilder.py |  6 +++---
>  testsuite/citest.py    |  2 +-
>  testsuite/start_vm.py  | 21 +++++++++++----------
>  3 files changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
> index 6a3cf052..9139cd7b 100755
> --- a/testsuite/cibuilder.py
> +++ b/testsuite/cibuilder.py
> @@ -201,7 +201,7 @@ 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',
> image='isar-image-base', enforce_pcbios=False): time_to_wait =
> self.params.get('time_to_wait', default=60) 
>          self.log.info('===================================================')
> @@ -224,7 +224,7 @@ class CIBuilder(Test):
>              os.unlink(latest_link)
>          os.symlink(os.path.basename(output_file), latest_link)
>  
> -        cmdline = start_vm.format_qemu_cmdline(arch, self.build_dir,
> distro,
> +        cmdline = start_vm.format_qemu_cmdline(arch, self.build_dir,
> distro, image, output_file, None, enforce_pcbios)
>          cmdline.insert(1, '-nographic')
>  
> @@ -235,7 +235,7 @@ class CIBuilder(Test):
>          module_output = b'Just an example'
>          resize_output = None
>  
> -        bb_output = start_vm.get_bitbake_env(arch, distro).decode()
> +        bb_output = start_vm.get_bitbake_env(arch, distro,
> image).decode() image_fstypes = start_vm.get_bitbake_var(bb_output,
> 'IMAGE_FSTYPES') wks_file = start_vm.get_bitbake_var(bb_output,
> 'WKS_FILE') # only the first type will be tested in start_vm.py
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index 7aa1e6b5..08a2a00e 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -351,7 +351,7 @@ class VmBootTestFull(CIBaseTest):
>          # test efi boot
>          self.vm_start('amd64','buster')
>          # test pcbios boot
> -        self.vm_start('amd64', 'buster', True)
> +        self.vm_start('amd64', 'buster', enforce_pcbios=True)

i would move that to "all names", not a mix of names and positional

Henning

>      def test_amd64_focal(self):
>          self.init()
> diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
> index 82fe489e..d6c47dcd 100755
> --- a/testsuite/start_vm.py
> +++ b/testsuite/start_vm.py
> @@ -9,8 +9,8 @@ import subprocess
>  import sys
>  import time
>  
> -def get_bitbake_env(arch, distro):
> -    multiconfig = 'mc:qemu' + arch + '-' + distro +
> ':isar-image-base' +def get_bitbake_env(arch, distro, image):
> +    multiconfig = 'mc:qemu' + arch + '-' + distro + ':' + image
>      output = subprocess.check_output(['bitbake', '-e',
> str(multiconfig)]) return output
>  
> @@ -21,18 +21,19 @@ def get_bitbake_var(output, var):
>              ret = line.split('"')[1]
>      return ret
>  
> -def format_qemu_cmdline(arch, build, distro, out, pid,
> enforce_pcbios=False):
> -    bb_output = get_bitbake_env(arch, distro).decode()
> +def format_qemu_cmdline(arch, build, distro, image, out, pid,
> enforce_pcbios=False):
> +    bb_output = get_bitbake_env(arch, distro, image).decode()
>  
> -    rootfs_image = ''
>      extra_args = ''
>      cpu = ['']
>  
>      image_type = get_bitbake_var(bb_output,
> 'IMAGE_FSTYPES').split()[0] deploy_dir_image =
> get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE') base = 'ubuntu' if
> distro in ['focal', 'bionic'] else 'debian' +
> +    rootfs_image = image + '-' + base + '-' + distro + '-qemu' +
> arch + '.' + image_type +
>      if image_type == 'ext4':
> -        rootfs_image = 'isar-image-base-' + base + '-' + distro +
> '-qemu' + arch + '.ext4' kernel_image = deploy_dir_image + '/' +
> get_bitbake_var(bb_output, 'KERNEL_IMAGE') initrd_image =
> get_bitbake_var(bb_output, 'INITRD_IMAGE') 
> @@ -48,7 +49,6 @@ def format_qemu_cmdline(arch, build, distro, out,
> pid, enforce_pcbios=False): extra_args = ['-kernel', kernel_image,
> '-initrd', initrd_image] extra_args.extend(kargs)
>      elif image_type == 'wic':
> -        rootfs_image = 'isar-image-base-' + base + '-' + distro +
> '-qemu' + arch + '.wic' extra_args = ['-snapshot']
>      else:
>          raise ValueError('Invalid image type: ' + str(image_type))
> @@ -87,8 +87,8 @@ def format_qemu_cmdline(arch, build, distro, out,
> pid, enforce_pcbios=False): 
>      return cmd
>  
> -def start_qemu(arch, build, distro, out, pid, enforce_pcbios):
> -    cmdline = format_qemu_cmdline(arch, build, distro, out, pid,
> enforce_pcbios) +def start_qemu(arch, build, distro, image, out, pid,
> enforce_pcbios):
> +    cmdline = format_qemu_cmdline(arch, build, distro, image, out,
> pid, enforce_pcbios) cmdline.insert(1, '-nographic')
>  
>      print(cmdline)
> @@ -99,9 +99,10 @@ if __name__ == "__main__":
>      parser.add_argument('-a', '--arch', choices=['arm', 'arm64',
> 'amd64', 'i386', 'mipsel'], help='set isar machine architecture.',
> default='arm') parser.add_argument('-b', '--build', help='set path to
> build directory.', default=os.getcwd()) parser.add_argument('-d',
> '--distro', choices=['buster', 'bullseye', 'bookworm'], help='set
> isar Debian distribution.', default='bookworm')
> +    parser.add_argument('-i', '--image', help='set image name.',
> default='isar-image-base') parser.add_argument('-o', '--out',
> help='Route QEMU console output to specified file.')
> parser.add_argument('-p', '--pid', help='Store QEMU pid to specified
> file.') parser.add_argument('--pcbios', action="store_true",
> help='remove any bios options to enforce use of pc bios') args =
> parser.parse_args() 
> -    start_qemu(args.arch, args.build, args.distro, args.out,
> args.pid, args.pcbios)
> +    start_qemu(args.arch, args.build, args.distro, args.image,
> args.out, args.pid, args.pcbios)