From patchwork Fri Oct 2 07:01:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akarpovich X-Patchwork-Id: 5520 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 02 Oct 2026 09:05:12 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f59.google.com (mail-wr1-f59.google.com [209.85.221.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69275ANx004018 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Oct 2026 09:05:10 +0200 Received: by mail-wr1-f59.google.com with SMTP id ffacd0b85a97d-48704504d61sf2440836f8f.3 for ; Fri, 02 Oct 2026 00:05:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790924703; cv=pass; d=google.com; s=arc-20260327; b=LO5gv5H2Qp0gf2fy4w1d9Ah4Dt23bntnH7b3kqF5M2FuAq66/CeRaz43L/JRuYYLZV th1JRiyQej8zTIHFAemne5f/n8XjLic3z/gfkTumN0R4rKa0fqjEwdsvVExHX4+HxoLM X4PFCE/dUq5otd5dg+sF+/xIFpoOUSBM2unslbaHU4gmy2u++aEnTtO91mnhTAjRc0ic Syr1r9dpaQI/JDxYTOPYkm14cUzHDUxSwWaaxRUdPFAmH3xEOYtz9k9SVZRQCbLq0sWV PD5+vYJwRNory9Xqocdth1Qv/CD9DeIOJzPlyi2Ebd2g6qL/YNFNUvzaFByPfxcCNKS3 wGNw== 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=tCJn0zy6e8q6oPejWu0nWrmb9rYsUfSfcdiFDQS+F6M=; fh=uqMiGDXN4NkclaWWzwb/qvXpmHw5Mn7XPBCfZM+07S4=; b=ctwCoFRQo/D8Nn33V3wmcsURfRY2GktzYMgPmq2dI9lh5iv3yXDA5TsBy84DjFQjJd qfkyXEOSEtgxbzlfB5a+ItSKJCb3tR42krKWKhSyUIsxUkReu54yJsFkDOFPqb22FTRK KJZz8nQ7xl2dVHRAO1YlivbHWQdXNHWgKb6ASxC07UO1yLqI54YqPq+czA08QwWuiQ8j +OZK6FS5pvQoYPqfbnCCSjPw0uwjRIfn4vwClzh4MxGLhCGZJl4AqYLp9RfLiCtITzdN y00XrulZO3BMqRs/Gj1dTG5Tp18F1kgzoeX8LyBCfPRoUjf+KN2NWWB/LW7jV4tyf6Bu 8IWA==; 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=1790924703; x=1791529503; 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=tCJn0zy6e8q6oPejWu0nWrmb9rYsUfSfcdiFDQS+F6M=; b=rjnncl6DRUmE6VcqAG4mga6uUFCdUP/Z54NrY2oNuhWL8SHSERt800eBrJDpryvRH0 5aBsd41R3VNBrFKr++29CqquV687hV3dI/ow49NdAKJOMiLlwVPuBun0zg0oFjE5mGVN rQejXODYU+fKANyayBgD4523cFeRlmy+KqAPX2socH5qOO0zO2MZ11KNU3LI7WZHzLux pnrVIjwazjq+mFc7xLTL9CFTQme8sdjdr8C6qFfuqWiQ/yvCBkeMGA4QzTqiMkZrzkJy ROwkLaYwaYAOIlLeCzJ6Mixh9zPVgHDBKXu28QsZsNH59MZMbpnrMXrcEXAj2FHUF5lX vyLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790924703; x=1791529503; 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=tCJn0zy6e8q6oPejWu0nWrmb9rYsUfSfcdiFDQS+F6M=; b=BfkF90gwfNqwHhrHzQXFCxla/njGsWKKr4GfWUDg1vkCseBRfmxuaXA+NcMQknHaXa +bAXf3txRf3Ol/4g8AWVUQqw8jiNCsGcc6eyABx2rv5ac4Q9AqFtEOHgxoBbJhLiZHph spgwUnnvW9ABBv33u+lmTVkClXz67cLi8uU/OqthtCBcJHpi2JcMkengztNd1epLirAG PK0YQwnRSXfqY0N5/tKt9cdY2kcDIB1X12UQYandHEWF5aA7qLNdjtCPaCZCCU4LHPoO q7pVsPYl/LikW0JtllAivG/D9nYMyZQ7tTJITDnspqqxtZr7M1Ib06Tnt5szhNeevZ1k pYPw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBwil0hYKld+07TfBitY0wpEBTm/v8qoHMo86ZanM/qhXBjHpnHPGNGeB7xNYUUmf7NC2eUClKQ=@isar-build.org X-Gm-Message-State: AFuF++kkKD5OyItk7DfXWWQiHEqz5AFBonxrkJBbl1rLDtAk7IJ5g2OQ gux2Pm1unSLQIS4wh9PIUegLwP/l6idN3oCcWzb8pw0+faU6T6Sbo3pv X-Received: by 2002:a05:600c:1546:b0:4a0:1c43:3c04 with SMTP id 5b1f17b1804b1-4a02756e5edmr31789885e9.13.1790924702792; Fri, 02 Oct 2026 00:05:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfWty0j0XmsuPczBBD7xVEVPXdSjVGJSL4kSnkjDW11EQ==" Received: by 2002:a05:600c:4594:b0:499:8364:19be with SMTP id 5b1f17b1804b1-4a02861bf4cls3335295e9.2.-pod-prod-04-eu; Fri, 02 Oct 2026 00:05:01 -0700 (PDT) X-Received: by 2002:a05:600c:1546:b0:4a0:1c43:3c04 with SMTP id 5b1f17b1804b1-4a02756e5edmr31787985e9.13.1790924700815; Fri, 02 Oct 2026 00:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790924700; cv=none; d=google.com; s=arc-20260327; b=TRvifkvdg9LU4PNLox8WP7FEaBk/nB8qbcwscB61fSO7pcSBgs8uvYAWbcgAtC+1e0 tQbcBQ38f3u8BPCUeUhh8u3njsG655ze1C3tYIM0bNI8VZah903cO91TMZGEkpU8pZ9r F/PAZELMiGGRoIzn5gCTJaYhVhkM7Q4DfsPZ5VcTN5Eqt2ZrS39ZHKgtg9IBoggnUCzo W4fgQCUUzrskI1P3bJFWQsSSW+kw9uD44GBz6pGD4vqCH+1VUrlLlPaP9OfGz3a1SMx3 31fFmf9+u7aZZNEEbJ57rbncconGhmbY9Q6a1l8biJt3G+UvEZ2tUvl6Fo+1UuZMjkn1 sO3g== 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=sIIVCfY0gPIsPacWQnGKL+djwi3sXvz36GQCSeK5yX4=; fh=2ALxNboLzDt503PhX56nFQ4pQzOkkVjVTCOSpqCio6o=; b=mOs/LqyaQJ9T4+o6BNb/UugWovm/QS1UgpZsjjSciEgPc7pdwI4pUsbcT5rqtDNHBK eTN97ZCr3I5eGaGBk+Id99ovFyVK5lgYdcvz2lCxg6+YRgHBPXNcN1mhCGZLIchvqcEw /Kv5WZfUSd9FoC5op/oQA+edmbHpaV/NVQZ8Xae5ucWbmMhJcB06mJfcdwqcMP54oNeE xLMnQ+2k6PFTThmVTjnVgn1VGRhzA1rZhMVtk6WFYdHpy0MPTA+vnSdJo6j6uT/F1xeB aaJsoWARv+a0CxoxorQxduCb8T9AgbMmUnXWXI3t/LB7G8dGOsYGcevGToP6UsuUYNQS EMxQ==; 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 5b1f17b1804b1-4a0280af5easi227365e9.3.2026.10.02.00.05.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Oct 2026 00:05:00 -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 laptop-0xxx (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 69274a1m003799 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Oct 2026 09:04:59 +0200 From: akarpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [v11 07/12] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Fri, 2 Oct 2026 09:01:10 +0200 Message-ID: <20261002070335.26526-8-akarpovich@ilbers.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261002070335.26526-1-akarpovich@ilbers.de> References: <20261002070335.26526-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 2cf8448b..cff22282 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -153,10 +153,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( targets=targets, gpg_pub_key=gpg_pub_key if signed else None, diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 1d415084..ca75f2e1 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -174,6 +174,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" @@ -197,6 +201,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"===================================================" ) @@ -305,6 +310,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: