diff mbox series

[v10,4/8] testsuite: Allow variable bootstrap providers

Message ID 20240708061738.311938-5-amikan@ilbers.de
State New
Headers show
Series Migrate to mmdebstrap | expand

Commit Message

Anton Mikanovich July 8, 2024, 6:17 a.m. UTC 
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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/testsuite/cibase.py b/testsuite/cibase.py
index fd571c29..d8106941 100755
--- a/testsuite/cibase.py
+++ b/testsuite/cibase.py
@@ -181,8 +181,11 @@  class CIBaseTest(CIBuilder):
         # Rebuild image
         self.move_in_build_dir('tmp', 'tmp_before_sstate')
         self.bitbake(image_target, **kwargs)
+        bootstrap_target_task = CIUtils.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']),
@@ -206,7 +209,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']),
@@ -220,7 +223,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']),