From patchwork Mon Jul 27 11:26:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5293 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 27 Jul 2026 13:29:16 +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 66RBTF4e001061 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 27 Jul 2026 13:29:15 +0200 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-5b2a9f6b0b2sf1527356e87.2 for ; Mon, 27 Jul 2026 04:29:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1785151748; cv=pass; d=google.com; s=arc-20260327; b=XTThW+9yEiD+qNrYdGKoc4Z7jVu84HAWt58jzA2+z1bi1tZMZBPxG7Kf0vWity5oFf zj03EtAePgHDUKNUEE8FNKmFRBRhPUSXkdDDntF3LJhu6NOllBt95dQMczBqmHaSgmBq fr6+fnwfHMyZSBJG+WwXDP4gsDubxzvNBXomrxB5OSzApsqMzVn9SuQd06uBzrJ0N7D6 xMG7JINotA8OZDUuDxGVGL6HEUaCSW8X6g7faT9Vhc3btYBTca1Fmbe3x0JQicV2BvJB veFaqtDHXKaG6R0VcbO3GtMkTXupgCxkuaFhiOPzvV2P+gzOnhFvbjgDWJjVaEFvfePc 2N2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=/QtgB5f+B8U3nW8Zbwk2AXqU7XZbvf8hNHWqPmcqKAY=; fh=TKI0ToTis0x0hUW7sTjKFzaSUPn9C+uSNym1N6QHNPg=; b=JiG027/sL6+TRPqYcuiJavSWn0ST/VJuRByfmyp/rrw5Dyj/KtrARe4HRF5xUb3+C6 MnvKM+6oBVUjSrHPvt2XpwZAFWnGjvmlxWkOCCe5z26/K0ruxt+tULQUImqF6nGd/0za Pz/3jLu771W92ajzjuVfv+3+K+UPszebyUc/QiPfAR59kvWULFGZzBpsHiFHti3fnNUK r1nICVOk/S3bmpnkboNOUuH50L10sColxVeqXumUWD/iNs3icQdUzPxzR14QSrdycwYV w5KtR1c7IUpr4O2IK0VH2I4SCu2EMLx/LYOEc//CS5j605VgX4OVfrbQ0/uygJYDxO2z RUHA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1785151748; x=1785756548; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type :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:content-type; bh=/QtgB5f+B8U3nW8Zbwk2AXqU7XZbvf8hNHWqPmcqKAY=; b=poOt3xjcR7UDwBxk4f1HeNrWQwl40KKbsaESBDB/Y9zXbjUUtbh0KgZ4MRuYUOlhh3 aM7zvk2GhHi/pmIfgu7kedIDeBJlfgew5N56iDDsvV/j2itZY2Ztz+X8VOpW/SVFA3xZ Vtm7Zss+ck15iG1GGmzPl7APJd2PsKVr+4Q6Ut7fTJ+PQBSlH4nC5n/QfUlLbTdYuFV4 iCGpCfQG38R4SSVsqUKjRkNCphiq69xU9HoQsY0UJ64uj8eUnck6SzImpg4UTiE0nuKK hheZ/w4hRbPltfcSkCKKfPaks/VLxRSLONkrHj3q7/dCfETzshRvzuaDDpYDJU4Df3L+ Yo5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785151748; x=1785756548; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type: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:content-type; bh=/QtgB5f+B8U3nW8Zbwk2AXqU7XZbvf8hNHWqPmcqKAY=; b=piDixdfzYoraAZGhWQakYZPyVvcI1a0x0B0SaQ8jCoVUXo3RIIxMaIttGlOvYlyAkj m9NXM0QKbM79fomHofqQWSlowJeTXeAt2yfZdkioLxbXamJGVrsMNMan/f2eqBbAMn4Z hgaLCCYdoxMscyJ02F4JITPEHxA/AUEiMnZjblhYUxc2RQxan3mivGlthqRU7JSSM/OK EdWuphVaWrgS3Io981mquTU37pndrF/H9lXShgvosnQ4kSxOwl7Et8kVlkHb9hbCn7eq iI7v9rhF63F1SZoDg1pJGie1T6vNaPyTx18qSGuQXkmSlxeWwn0KRPBgVy8qQuoYVeIb gpJw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+RrLXgQlSXQUn/bji0D+WEjFDFhbl60HiXCVuvxb5dhx6mg/oAa8WUcYQtQ9laJQEYf2EX0Bizg=@isar-build.org X-Gm-Message-State: AOJu0YwBFsDGzyM0mqMTxi52atSGjBJsUKzUnoqP5fd7FiDDcz0t7Etb 0QnAoA3pcvAn1fWmRyCYgp7SH2uoiFCNa5q9nvZkiCcrv6oeODJNKSHf X-Received: by 2002:a05:6512:3d1e:b0:5ae:b5a9:6e86 with SMTP id 2adb3069b0e04-5b2c1b4370dmr1602380e87.52.1785151747568; Mon, 27 Jul 2026 04:29:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPTf1mH3xYiJGZh3cX0GhlxzK9MlTtIfGTB0m5i/dr8M0A==" Received: by 2002:ac2:5327:0:b0:5b2:a215:a2aa with SMTP id 2adb3069b0e04-5b2b72465e2ls43014e87.1.-pod-prod-06-eu; Mon, 27 Jul 2026 04:29:05 -0700 (PDT) X-Received: by 2002:a05:6512:15a7:b0:5b0:227d:ceed with SMTP id 2adb3069b0e04-5b2c1b4e838mr1434488e87.57.1785151745182; Mon, 27 Jul 2026 04:29:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1785151745; cv=none; d=google.com; s=arc-20260327; b=mwslHPOr7xN3U+MdyA00f6uBawZB8JpmoR/Fl+vD9NlQ+EtC+EmbYDs4vu0p0YwFSl bQB46K4K9wIuTVcdxxyZSgUuO8/ouTizOBtObbSyavi0Aa3x6xnc+e5yTQwiL2CH3sEz 8w1i7lKayCeUIYZqnii4S2X0hrEVJyRqTZCZ7AbTTo+rADSB5/wcmWEE5AZphIZzebf9 7RA3sjcghlEU7DkdrUK7YTnVkzXV71kyeX0w2ZwCQeCqKZN3XWPNuYbOTJAZkpqDWu6Z zxTTmxEMdV6S61jbkMva8GYLc1JB8nQVeudHNdpoEOPGpMjgtQvs3A4SCD1CtY3uC2Eb hp1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=wGGZz4b8dbpDvIf+uQM4CQf8ls7KiB8aJyUZ2ICPF34=; fh=2ALxNboLzDt503PhX56nFQ4pQzOkkVjVTCOSpqCio6o=; b=spvuiOfoW/VwScL5fPxwFk1tbyYHrzgPgLvL3FWB34sXsksXJKQYwsUFfxlpoYouIC SJNPkW+bgNJd44NHGRT6vAfEdpL6T9b++SKjb9ocX/Iig2SRE7VnuGZKmiv1UgTTFr1t Mayfa2qVDUnPh5qz0mIZk2w0lvI9Xur7wol0kbvn3o0TJ03B2H9MpLBBFIKQ5b49D/35 F7NREzOFhZPud/cPQjYOFJ4JkQ7b1J4JPMudkxwOcEdOC+CnBxuuHXVVA/3c4Inm6gb+ tHDtCNCx2GknCXTK+XzC64oXB6EBC8WY66TdAhdxGYGY9sM1LKuSPabmD6lXXfh5J5Nx P13g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-39f221589e9si1484291fa.1.2026.07.27.04.29.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2026 04:29:05 -0700 (PDT) Received-SPF: pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from akarpovich-Victus-by-HP-Laptop-16-e0xxx.promwad.corp (62.122.174.6.serverel.net [62.122.174.6] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 66RBSjdX000930 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 13:29:04 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [v8 07/14] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Mon, 27 Jul 2026 13:26:25 +0200 Message-ID: <20260727112812.2255297-8-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727112812.2255297-1-akarpovich@ilbers.de> References: <20260727112812.2255297-1-akarpovich@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_DNSWL_BLOCKED,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: akarpovich@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@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?= From: Uladzimir Bely This makes Isar use `base-apt` repo in different way. Any package installation is done from `base-apt` repo which is prepopulated from external mirrors. This behaviour is disabled by default for downstreams. To enable it, set the variable to "1", like isar does in local.conf.sample. In order to be able to run CI in old mode, allow CI read the option from the environment. Also, adjust some tests (like repro one) to make them work with ISAR_PREFETCH_BASE_APT set. Signed-off-by: Uladzimir Bely --- meta-test/conf/local.conf.sample | 3 +++ testsuite/cibase.py | 4 ++++ testsuite/cibuilder.py | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index 2dbe28f1..74ee90b1 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -27,6 +27,9 @@ BB_DISKMON_DIRS = "\ MIRRORS ?= "git?://salsa\.debian\.org/debian/.* git://github.com/ilbers/BASENAME" MIRRORS += "https?://cdn\.kernel\.org/.* https://mirrors.edge.kernel.org/PATH" +# Use new base-apt behaviour +ISAR_PREFETCH_BASE_APT ?= "1" + # Users and groups USERS += "root" USER_root[password] ??= "$6$rounds=10000$RXeWrnFmkY$DtuS/OmsAS2cCEDo0BF5qQsizIrq6jPgXnwv3PHqREJeKd1sXdHX/ayQtuQWVDHe0KIO0/sVH8dvQm1KthF0d/" diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 4a6308d0..348b8cde 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -71,10 +71,14 @@ class CIBaseTest(CIBuilder): self.fail("GPG import failed") try: + self.move_in_build_dir('tmp', 'tmp_before_repro') self.bitbake(targets, **kwargs) repro_type = 'signed' if signed else 'unsigned' self.move_in_build_dir('tmp', f"tmp_middle_repro_{repro_type}") + + os.makedirs(f"{self.build_dir}/tmp/deploy/") + self.move_in_build_dir(f"tmp_middle_repro_{repro_type}/deploy/base-apt", 'tmp/deploy/base-apt') self.configure( gpg_pub_key=gpg_pub_key if signed else None, offline=True, diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d42e8631..34aed471 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -161,6 +161,10 @@ class CIBuilder(Test): fail_on_cleanup = os.getenv('ISAR_FAIL_ON_CLEANUP') strlines = None if lines is None else '\\n'.join(lines) + + # get prefetch base apt mode from environment + prefetch_base_apt = os.getenv('ISAR_PREFETCH_BASE_APT') + self.log.info( f"===================================================\n" f"Configuring build_dir {self.build_dir}\n" @@ -184,6 +188,7 @@ class CIBuilder(Test): f" generate_sbom = {generate_sbom}\n" f" rootless = {rootless}\n" f" lines = {strlines}\n" + f" prefetch_base_apt = {prefetch_base_apt}\n" f"===================================================" ) @@ -288,6 +293,8 @@ class CIBuilder(Test): f.write('ISAR_ROOTLESS = "1"\n') if lines is not None: f.writelines((line + '\n' if not line.endswith('\n') else line) for line in lines) + if prefetch_base_apt == "0": + f.write('ISAR_PREFETCH_BASE_APT = "0"\n') # include ci_build.conf in local.conf with open(self.build_dir + '/conf/local.conf', 'r+') as f: