From: Anton Mikanovich <anton.mikanovich@promwad.com>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v14 04/16] start_vm.py: Fix ubuntu image name
Date: Thu, 30 Sep 2021 19:45:29 +0300 [thread overview]
Message-ID: <1633020341-26062-5-git-send-email-anton.mikanovich@promwad.com> (raw)
In-Reply-To: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com>
From: Anton Mikanovich <amikan@ilbers.de>
Choose 'ubuntu' base name for 'focal' target, not 'debian'.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
testsuite/start_vm.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index face747..8f0ccd6 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -30,8 +30,9 @@ def format_qemu_cmdline(arch, build, distro, out, pid):
image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE')
deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE')
+ base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian'
if image_type == 'ext4-img':
- rootfs_image = 'isar-image-base-debian-' + distro + '-qemu' + arch + '.ext4.img'
+ rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img'
kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE')
initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE')
@@ -47,7 +48,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid):
extra_args = ['-kernel', kernel_image, '-initrd', initrd_image]
extra_args.extend(kargs)
elif image_type == 'wic-img':
- rootfs_image = 'isar-image-base-debian-' + distro + '-qemu' + arch + '.wic.img'
+ rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img'
extra_args = ['-snapshot']
else:
raise ValueError('Invalid image type: ' + str(image_type))
--
2.7.4
next prev parent reply other threads:[~2021-09-30 16:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 16:45 [PATCH v14 00/16] Update Avocado testsuite Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 01/16] start_vm.py: Fix target name handling Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 02/16] start_vm.py: Add output and PID file vm_start.py options Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 03/16] start_vm.py: Add MIPS support Anton Mikanovich
2021-09-30 16:45 ` Anton Mikanovich [this message]
2021-09-30 16:45 ` [PATCH v14 05/16] vm_boot_test: Fix log file path in vm_boot_test Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 06/16] vm_boot_test: Remove external varianter Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 07/16] vm_boot_test: Improve QEMU images checking Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 08/16] build_test: Refactoring build tests cases Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 09/16] testsuite: Add Python generations for testsuite in gitignore Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 10/16] testsuite: Fix test suite prepare guide Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 11/16] gitlab-ci: Add Avocado build artifacts Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 12/16] gitlab-ci: Add debug flag Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 13/16] vm_boot_test: Add automatic bitbake init Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 14/16] build_test: Protect ubuntu target with KFAIL Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 15/16] ci_build: Migrate to Avocado Anton Mikanovich
2021-09-30 16:45 ` [PATCH v14 16/16] vm_smoke_test: " Anton Mikanovich
2021-10-14 8:54 ` [PATCH v14 00/16] Update Avocado testsuite Jan Kiszka
2021-10-14 10:25 ` Baurzhan Ismagulov
2021-10-14 15:51 ` Jan Kiszka
2021-10-19 8:34 ` Schmidt, Adriaan
2021-10-22 6:54 ` Anton Mikanovich
2021-10-19 9:54 ` Henning Schild
2021-10-21 9:48 ` Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1633020341-26062-5-git-send-email-anton.mikanovich@promwad.com \
--to=anton.mikanovich@promwad.com \
--cc=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox