diff mbox series

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

Message ID 20241106082117.1089554-5-amikan@ilbers.de
State Accepted, archived
Headers show
Series Migrate to mmdebstrap | expand

Commit Message

Anton Mikanovich Nov. 6, 2024, 8:21 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 cccac86c..075535b1 100755
--- a/testsuite/cibase.py
+++ b/testsuite/cibase.py
@@ -216,10 +216,13 @@  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',
+                    bootstrap_target_task,
                     ['do_bootstrap_setscene', '!do_bootstrap'],
                 ),
                 check_executed_tasks(
@@ -257,7 +260,7 @@  class CIBaseTest(CIBuilder):
         if not all(
             [
                 check_executed_tasks(
-                    'isar-bootstrap-target', ['do_bootstrap_setscene']
+                    bootstrap_target_task, ['do_bootstrap_setscene']
                 ),
                 check_executed_tasks(
                     'sbuild-chroot-target', ['!do_sbuildchroot_deploy']
@@ -282,7 +285,7 @@  class CIBaseTest(CIBuilder):
         if not all(
             [
                 check_executed_tasks(
-                    'isar-bootstrap-target',
+                    bootstrap_target_task,
                     ['do_bootstrap_setscene', '!do_bootstrap'],
                 ),
                 check_executed_tasks(