public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v9 4/8] testsuite: Allow variable bootstrap providers
Date: Fri, 14 Jun 2024 14:34:21 +0300	[thread overview]
Message-ID: <20240614113425.122722-5-amikan@ilbers.de> (raw)
In-Reply-To: <20240614113425.122722-1-amikan@ilbers.de>

If we can use different recipes provide bootstrap, recipe name should
be obtained from target environment.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 testsuite/cibase.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/testsuite/cibase.py b/testsuite/cibase.py
index 0f6997af..c6117b36 100755
--- a/testsuite/cibase.py
+++ b/testsuite/cibase.py
@@ -179,8 +179,9 @@ class CIBaseTest(CIBuilder):
         # Rebuild image
         self.move_in_build_dir('tmp', 'tmp_before_sstate')
         self.bitbake(image_target, **kwargs)
+        bootstrap_target_task = self.getVars('PREFERRED_PROVIDER_bootstrap-target', target=image_target)
         if not all([
-                check_executed_tasks('isar-bootstrap-target',
+                check_executed_tasks(bootstrap_target_task,
                     ['do_bootstrap_setscene', '!do_bootstrap']),
                 check_executed_tasks('sbuild-chroot-target',
                     ['do_rootfs_install_setscene', '!do_rootfs_install']),
@@ -204,7 +205,7 @@ class CIBaseTest(CIBuilder):
         self.move_in_build_dir('tmp', 'tmp_middle_sstate')
         self.bitbake(package_target, **kwargs)
         if not all([
-                check_executed_tasks('isar-bootstrap-target',
+                check_executed_tasks(bootstrap_target_task,
                     ['do_bootstrap_setscene']),
                 check_executed_tasks('sbuild-chroot-target',
                     ['!do_sbuildchroot_deploy']),
@@ -218,7 +219,7 @@ class CIBaseTest(CIBuilder):
         process.run(f'find {self.build_dir}/sstate-cache/ -name sstate:hello:* -delete')
         self.bitbake(image_target, **kwargs)
         if not all([
-                check_executed_tasks('isar-bootstrap-target',
+                check_executed_tasks(bootstrap_target_task,
                     ['do_bootstrap_setscene', '!do_bootstrap']),
                 check_executed_tasks('sbuild-chroot-target',
                     ['do_rootfs_install_setscene', '!do_rootfs_install']),
-- 
2.34.1


  parent reply	other threads:[~2024-06-14 11:34 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-14 11:34 [PATCH v9 0/8] Migrate to mmdebstrap Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 1/8] isar-bootstrap: Move common parts to bbclass Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 2/8] meta: Add mmdebstrap recipe Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 3/8] meta: Allow selecting bootstrap providers Anton Mikanovich
2024-06-14 11:34 ` Anton Mikanovich [this message]
2024-06-14 11:34 ` [PATCH v9 5/8] mmdebstrap: Fix missing dpkg available Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 6/8] mmdebstrap: Move preparations to hooks Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 7/8] isar-bootstrap: Use tar output instead of directory Anton Mikanovich
2024-06-14 11:34 ` [PATCH v9 8/8] user_manual.md: Update boostrap related documentation Anton Mikanovich

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=20240614113425.122722-5-amikan@ilbers.de \
    --to=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