From patchwork Fri Jun 14 11:34:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3607 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 14 Jun 2024 13:34:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45EBYl9X032122 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Jun 2024 13:34:47 +0200 Received: by mail-wm1-f58.google.com with SMTP id 5b1f17b1804b1-421f43ddc2asf13421175e9.1 for ; Fri, 14 Jun 2024 04:34:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718364881; cv=pass; d=google.com; s=arc-20160816; b=IUKU9soapHrOD/pIwR8u+gR5PAriNgtFvuMdVt4G2UND7xjebT/StGBdaCTzzSS8ys QdeATJX2id6c4MtzJnS4F8HTRTItlFmgHGbqT2QrA/CBRwQMsw0le55o0t0JDzmb6CmT xq1TVPGCadJqDY0w9po64BXy7JvzzEkuIE50wkACFiUt1//bC8tsF8RnwjwOOgagNe5u U+YZOIIND0LcftSA+c1dh69/txkKv8W9Q654SiDw4qDDsFupwxvHc15+Egkb/ZtKNfmd dxmvqAlzkTJ1TtTElo7nXLXY7UPULMfAcwGaATNnQlu6BoWEYGvZGmKd72gVNJGb+xET 5wrQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=rZ2DTS3TAhPBJtepyK/W1kYXyjhcvMQWjAlDSrtIFOs=; fh=d9Aup7oew3q6T9KuTA82Px22YJYRFKa6Ffzde7e3GcQ=; b=x1s5GEW9rMMVUBvYzyE3mbDiYRAhl3kqHQY07Xm5PVWY9QOKD92fjEQ3HlYsepumnA 8SZQOJ/1CAHOAT8d4h5jfb/omqfIujyV1VHLVXCXIAKmVPO9rFTVgZWKLO0+HuDIHHyp Xh7f1pCUdXj1GJUCtT0joDW2tl9yrXpG73hvkPAuQujA3APNEaZRdc311zcsYA+ydPp/ pGjTiyCtMtQYmyP8jGpue44qZB3boq3FIncu/DkdWp6Uvy3+8OzxMwZdlueZZuofVecV F6O55Z+dDy41coMZ0KGv+u+Y09dq3tzviLPRefGBd6a5XRq9CzGAIvnGX7w5i/8TNO9T ruTA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718364881; x=1718969681; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=rZ2DTS3TAhPBJtepyK/W1kYXyjhcvMQWjAlDSrtIFOs=; b=sYt3+350wFczp6D1blABdifKvm5ThahEWYlZi2nsR5zdTY3s6G/X+s2/xscCM9B/Tg YWWLljGxqIsCPizLq80XYUBLjrHM41ygWp4+GkEGZLKeeJTUbM+ItlMLqCJ9L7k8PziQ 9ugETBL8jmfdw4y+NKiCmU9uSVA9QG7172vlMDGYuHkatHK/6ic8J+HAuCkn9yT2feFe B3vubA1KxjOTSlmwL8uvxDc1tQlIu3aIHqpGlb6rulu2/LB8RJ97UMY+3Nfjy0UjjGK0 qUfORMmSoW4z4KF0U7/8PSxiwrdJgLaNnF+Tw9YuipcRbRLuptSO48qnvzRRJSjogzWp JXaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718364881; x=1718969681; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=rZ2DTS3TAhPBJtepyK/W1kYXyjhcvMQWjAlDSrtIFOs=; b=D7fF4HM7PfRJ8xovzMQjpkQuBMKYD09Hj9FqlAn2Gii5DloVBDQLUwZtLHBI2Qn2Id SZTV4/top35vfeWsqte5I3BEC4sO47zOh6CBO9+hT57Lc3ZZm+QMFeEjYQPd1Uc42DL6 EURHWuXtueyTPD2YKucgkNnR+QVqwPWA1Yt4n1rQzV5vnpm8D1nAWol+f9qB95uz0IJ+ hjf7RDgTif/Q6DQSRPxDwR8NLIIo2uXzbH9dyB8cRkaboS6KsfQEjtL+uNmm4xhis9AM AX7O5sGmKX2Rer2+SSW6yCsKyScnWy49iaURMQ03d/ATAJdFwqOn3tKrMC7i0KROq+lK djqA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXULu0gQiuMk6aHC5cHHNUYeuI+uM/MFOk/9kfsi1+xKcQ63gQC4xKTMFYPPu4ggfoCy78Ocbzea/3QHdmbczoSDHlRvhU= X-Gm-Message-State: AOJu0YzCJQhQytrSZBndHUx9148e6Y+SVNUq7gwcia6zDPQuLq0GcW29 7Sa4KOXAWEQEjEKALhSKXEuqIskgvHn9HpzKJMdoaQkaXSTaTlOw X-Google-Smtp-Source: AGHT+IFI/5vhAerEi8y+L+24QuGeX3qCcO9tioLvZP0xBQRbreo1ygTy6MR3XHIwdj9k3RZhLiF+dA== X-Received: by 2002:a05:600c:1990:b0:422:7996:3f37 with SMTP id 5b1f17b1804b1-42304844e18mr25009175e9.26.1718364880604; 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-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 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; 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 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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']),