From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7380320960081035264 X-Received: by 2002:a05:651c:b0a:b0:2ec:eee:f199 with SMTP id 38308e7fff4ca-2ec0eeef75amr20742851fa.32.1718364880760; Fri, 14 Jun 2024 04:34:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d2a:b0:422:1589:d81c with SMTP id 5b1f17b1804b1-422b8da8296ls8115845e9.2.-pod-prod-03-eu; Fri, 14 Jun 2024 04:34:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBDDArqG8cizTk7R7VP0OHoDJqeHgfqxRR1KLzqohd+QdpiEOKx7bRFQM94MwtEC3JPe5U X-Received: by 2002:a05:600c:9a3:b0:423:6957:89af with SMTP id 5b1f17b1804b1-42369578b0cmr4629575e9.29.1718364878922; Fri, 14 Jun 2024 04:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718364878; cv=none; d=google.com; s=arc-20160816; b=rUXUp8zyAGKMilhI61nlzVw5gUrQwQ6XOPJBMW0Hl4x77prB8Qeb6g7TxX0f2/50fS wnAuYpMjaIZYFjELdct0HMKvzO9YRcGHn90kdDppcLRFyTMaeMhyEIyWo+hXLtUuaHpC Lt+b+Ettzoh3iZ/evOTjhZK1dvZV9u+Bv3OQ3Ry/cWo6+PMIR7y3hrHWY4XTVPxHm+4R kTiX6mQVBl79XnBa12l+knATIo52fE3fWhNyBteSQsrLBkT9Tl3q0xQsg7y3cNGSgNYv X+zYSVR+noR6UlbVOl4IPO2/cGhn/jAZjZBo0UTBBr+iqubMsQX8AAecyh/jWTXYMopu CPjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=EiJvC1m1Zca/TZCK2jpyyP8VFQiVs7/H9VYteCrkijU=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=eZvjeMFHUa8q4bBhqAp+iVFqieOQskpPqNi/XCs6VV1k7b5+mb1J83cDNZlU+IL4+Y nJD8pnd9l+nTkrb0YaaTuR6daAlB3cGjCcIl5nwLeo8soBWj35sMEa/VVqCWqc3PXG4i aMzP6TvEg0ff3u/FIvcgDX228bMdd7GuL4c16SuzCZ3B819eSIuPhWVcF54wI6hVnKKP j5PS7scxrl7Hsab/vhc20/smrz+o/DLAp5NrNZ6MvaMIr4XOtLl0p4YD/G97MSHDH3+W htDFE32PNOLhPzxCxQE8edouoGla3jdz5yeAa6GtsHjPQUT3sXQv61lOFtZSoUtfmz9x rhtw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42285317d3bsi4224045e9.1.2024.06.14.04.34.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2024 04:34:38 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45EBYZP1032043 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 13:34:38 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v9 4/8] testsuite: Allow variable bootstrap providers Date: Fri, 14 Jun 2024 14:34:21 +0300 Message-Id: <20240614113425.122722-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614113425.122722-1-amikan@ilbers.de> References: <20240614113425.122722-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: HFkynqUqbqmf If we can use different recipes provide bootstrap, recipe name should be obtained from target environment. Signed-off-by: Anton Mikanovich --- 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