From patchwork Mon Jul 8 06:17:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3669 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jul 2024 08:18:04 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4686I24x030780 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jul 2024 08:18:03 +0200 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-52ea88005bfsf2324700e87.2 for ; Sun, 07 Jul 2024 23:18:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720419476; cv=pass; d=google.com; s=arc-20160816; b=jR1c+agUUhi8c7J8JCpcm/7YfyxnFZSVvUGd9KQt0BmE1tXl+MdMIbRfsZVRqDm1Ik yRI5kwJ+IEFaxXKmXkPwkG462lvqm6OXGQf9X3U51kJqZxTB7H3y8j5Vxv6z+s3a8Lzz Mz7muTRHZEITpHOIbgki0OfubqnSTCk4dzBZLiyxW7BCoMQqkBGf7Mgjlb0pyDpoO7Lk dSJPSY5ne5PDyQ9R+dVLNRk7J5c5z2qmZgNO7uYcFyJWkHu57HiqJRyzZnsfHXSoiyGf Ym33sxZ4K0IJtTxIyKyLLwoLykktI9EcQTxWxCE4014SY+UmfNFqlY6LlGzfh2QxCGH5 K3Wg== 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=gPf4YIdXJ53sy/zIOcShisZ0Z7uUgLbfZo7FXWsH6ig=; fh=yPiiAlKXl0hjsCJtYUiFNDmY9HsgUcbVlBduQo5etDk=; b=Rvom5MZxijXvH2tS9WCxV188jRGconejnGlA1pIfOjgzZvja4e2pPvl8yeJRd3md9l KvpW9yXrbQv82sBTL/ektPLZiVpkouGYglEElRLhIEnTJ5hqfHbAX+b7Ews6trpD5QKX oUS1AQUeDTorliSCh9j7DKmt9GMYS8tCiNFGwp+RbpCEAbFRADXTSouEFNjPoLbRApNE r1cO24WwUKu5p7i5Nvv5zTHir+COXYMie2U8+Btbx8As/CuKpEpeU7inUNCjNKYmJfIJ bdJACz94+GCKh9LRkNc6KJvTf7GDsQ6zQIMWwwPjYd0OalpRZ6xrXWGKGj2x6dUgKt0Q NAaw==; 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=1720419476; x=1721024276; 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=gPf4YIdXJ53sy/zIOcShisZ0Z7uUgLbfZo7FXWsH6ig=; b=RMeDlDK5zBu+dBtH0dc9z5GylmfjdHbzY4R7Mig21oog/ADnOtrXdcixd5uQz2mDIZ vkjk3YDhoDXE/7InMjCW21z1Fv6QAn+D4Ekqg/gGHa5f3VEn/vG1Y35Wr5RI1SyGP5QQ eko7U1sISsO7il3hP7aWf7nuoTDo79HAbSfmmM5ONDhFXnzE4oaTG8yRxmSZu9yRhpYy mFkuqU0xar57e1uxyPRNoPGA9Ndug16FnBJ02gnfdPWGICl7MnS6wGI1/1tygfneV7Gl u/XtqQjF6p1VsZBn8Cbcj8DW4RfGrf99lkS1HOKoVnpUnVDS3Zpq2bPOiwYQOPtSWu0d JbPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720419476; x=1721024276; 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=gPf4YIdXJ53sy/zIOcShisZ0Z7uUgLbfZo7FXWsH6ig=; b=bjAwP507zlfocNR/BX2T4CByJvd2C8SNg/TZIBuXLMtc2aPiF6oZM58ltnGniSo+8d PAZYPbW6KnhGGtsa43XnNxHR7doJr0Bls/p+FJTV1eCpGiEESjqPYxAGvcvawFHOr6AI N1eA0Ih/buMF+7D7Jb3vXN92gjx5YUB6h9ct94KyjsVp05Js8FCcJJFtD50HKsbIix94 gZWu+L4W3zWkxITv0B39/r0gpZf6VXSFXeBGFu0esVbC5RbdL6h5DD1sSuXtGJnqLqo5 176DTX/xTpcLD9L/P+wOmuz5VnQdNqwk7irEp64OsO5YtedC+C+ylJ4egfecPR4mVhol Ch9g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXvx8Fv0oNJL5aOWLk6dLtsVyETlsOhgfsvHAJhpcwzpX1SJfqK77h3qKPwngVCG1pF+bvHEu/CekiaLYKcpOtJp9mm9MU= X-Gm-Message-State: AOJu0YyvP6bHXssCN0uoQIYXeWAu1h4dhZBEJY1IIRiQ4qAmsM5E9sWg CWB/FEKWNMoaRq899Z6ZuOZirl715LMUnQ/Zf3SmVRC5C4Hylq4C X-Google-Smtp-Source: AGHT+IExHyg7LY3bRrGGyrCaGcoU8Kb/5frcTIJ5qZXSPUrwM9WNISM++V5DZaOHO1hp8ZdJEt0HNQ== X-Received: by 2002:a05:6512:3da3:b0:52c:d967:79c6 with SMTP id 2adb3069b0e04-52ea062dceamr8478505e87.20.1720419475672; Sun, 07 Jul 2024 23:17:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5ded:0:b0:52e:9d2f:233 with SMTP id 2adb3069b0e04-52e9f16bcb7ls1743092e87.0.-pod-prod-02-eu; Sun, 07 Jul 2024 23:17:54 -0700 (PDT) X-Received: by 2002:a19:910b:0:b0:52c:c032:538d with SMTP id 2adb3069b0e04-52ea062e3bbmr6565467e87.27.1720419473625; Sun, 07 Jul 2024 23:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720419473; cv=none; d=google.com; s=arc-20160816; b=S1l/uXUWiLy8lva3a96UZoNbBjh+955fLa3P0Shgmf+eTzikQkX0wjOyW4tpnjj9oq LYxwytk4Ss2bC8SaRLGLmb/rYHVmyQQsXAPiJCRU9+wNh2J0dfNCXwyvVIWQp8c7jDij bbIH3UElsO60Qfp35TDbLWruCRg5y2HyvkuyOf7nfSKibe7eohPxnwLmzvvsKbVy3d1U PcTu+ai7Bs8N1L0KVXF2TC+VS65D8wb2V21Qki+/dUsyCAiVZy8DNYXeseuZ+GCpv/vB G3So6oN5D6Nda1G53tkIsh4vY9DuhweR+SMZZBqfZbfO3/TwGmIg0IC1yDVOQv7l6mvC pOWQ== 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=sBHue/9A62wDtl9abyp77JTYIgWpPHTnzbErTm5jZwE=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=GvLqNWD71At3kCjVxVkje5rbNShKf7hcj80HfASukrdVHGGNKZB/7Lbwhf6Ud1Qp4y 7f5WjyeYNLDKFB6pl4JOIPCfFNlK7xPr2/S/5uPy6r8mTkHgK5kExDfb2x6t5n1m7RDD auQ52MlY/wujNnQyG2tYNtj5AeXM9AlP99GzksqhyKa8bv0VugU6W5wAmbO3GpSsmUOh Oi+M4P58B23ufCcyHBFI8oGeP455Q3TtbIvzr6KkvlAHWHIBC+UFCSII21AvICODyJ9M ZuwO56D3YuG0d9mZItDHpTd6YBKTQ1N1GYYdpX2ijFp1txcC83j8/oEwP7yr0VU2fdi8 wJmw==; 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 2adb3069b0e04-52eaf790c66si40704e87.10.2024.07.07.23.17.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Jul 2024 23:17:53 -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 user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4686HmUu030688 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 8 Jul 2024 08:17:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 4/8] testsuite: Allow variable bootstrap providers Date: Mon, 8 Jul 2024 09:17:34 +0300 Message-Id: <20240708061738.311938-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240708061738.311938-1-amikan@ilbers.de> References: <20240708061738.311938-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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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']),