From patchwork Fri Sep 4 07:52:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5427 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 04 Sep 2026 09:56:39 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f56.google.com (mail-wr1-f56.google.com [209.85.221.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6847uMoT004660 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Sep 2026 09:56:22 +0200 Received: by mail-wr1-f56.google.com with SMTP id ffacd0b85a97d-482e05af072sf565670f8f.3 for ; Fri, 04 Sep 2026 00:56:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1788508577; cv=pass; d=google.com; s=arc-20260327; b=pSvpPkiMwgvYj+4AMzLA7PU9dbXLJYQa5fBEhR44nq7lIik2XH88tsxQiEhDbPcD8d WAm1UftBb9G/akytS+u1ufIJcGQZZBBgPLkyy/meEEkVeRZgqGvsCd6y9NWoQvRixJ3Z zlJ7H6FwPdClHv3HEwmPMnXvJ3p/bdyuicBy+bq/Ku1Rnyf8AbP+LMmcbnze6DXTijLi wW4iq7V8lSvJjJwPvL6P8kGImOVIVyruw2Yxv9iPSng55GUPHqEEzypWLkpMHWGGpbK1 zj0dowA2RuJVz3Bm6l/64Q2x6DBCNbCr1ULdN78YSFprKIzLsqRYxqkoLf8NauPskHSX 6YnQ== 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=3EjbrRxULyXSodUzEwVr9OqAwxTs2MFvts4iqxDCqQI=; fh=OBoONMG5M6cMJiVblj5h1EvhqaBta+hsOWtm6pXr0qY=; b=fTYYiYH7dgGiMZdDDYIEpWgIkkw0Wntc2FiOr4dxU3Ylh1ns0Qahne9xM7D0alLY62 lDE1nEEPSxh5ni7NugseWazolwizuP8aMaKhFWsO7pJ8Nuj7yX9gXiYlHL+l8IijledD rsm1S14VlpRoiqkzmJZ6YnlTwV6YVyRDCdqPYdJQObhod4hZvTshhJObXxEd859PAUM7 z9t+16hUgld1CiBJ1cfwwNG7a+M1OVxvazKhDwyR6b3t4RnaRYHSd6IVC52IDezi9Z1D 9SkUjJLN8iu6SKDn71tAz+y+ePHEWTkmGeiUVym2wOuLi71oKOkWLYxSGxWREqW9uzUM YodQ==; 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=1788508577; x=1789113377; 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=3EjbrRxULyXSodUzEwVr9OqAwxTs2MFvts4iqxDCqQI=; b=lSsvTtWU/8/1iEqeImh1pjmSO5m+ZfUOZmVksRdkTBQtcbv1z5f4Tkgf7zNaiKF3Rx aqbBU00U3H5K6ReEQjOmJuD5iv3cFctvpsJNQaiFloBF5iZRd4rRaCGsBUVtGRbIo81M cFl25p7uWq9SSqEc2eOAnpz8XCSs8wjK+7ViqDXPvPDKofjbQHzSToN0pkecL8dyXEXo BoUZ4P66tkNVlxGJW004bBI+uRj7Uw0Hix5m5qJHElWJS2rxt218MLWlKJ0F9rhPa2St pIDQRs0gg5IRdNRHUTXZUGGOpiTgDVBYL+tdbxRqvq3Pnt7fD/97KCwjd6SP1/dFTDo3 L7ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788508577; x=1789113377; 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=3EjbrRxULyXSodUzEwVr9OqAwxTs2MFvts4iqxDCqQI=; b=CYpUICuEXtOT11gip4TDY9SNlFJM5RuJXcFzrmDRFKZflt/bhn9XFLok0OHgNpDrtd eiPO+0ToYmaE10tWcs/hTpVqNQFiUEPn4y938kUCcWnpbyOZGuGf7AKo3sv4d7Akd0eW u8OMh5GNOk5iXsN1Hd3l8QR5f05Z9Cb4dpk0ulSkCjExZzur/TYUAbVRfSNjzuFbf/AE 5zYTRGDnFVk0ijBEPpbnBxxc3eslb44UYWb2oxsYJB71PFstKfsP31AddSgV+D9irAm/ QZda8vcROLYnK5ovQK6O7ttuN+p0YC//qRrM+0PtzFNTydpKrb/oLQ2F5dgFARPqSI0r +gvQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBxSqyB3Nmkq/12cXCcFeZPcl3TMHxvCwkOvbJJ9W8AbFMgfmyzYvkaifLd8l1dUoWbU1bZzHRc=@isar-build.org X-Gm-Message-State: AFuF++nRwz+9aH75cv34tkWnd+iUdSKApPiHNqUmrrHUWNkBuIjD19Qm semdplFKyvAhhMjr09M0hchgHXM+wmCslUnbwdqKZpGgtlJqs84AkkcL X-Received: by 2002:a05:6000:2c05:b0:485:8c17:9771 with SMTP id ffacd0b85a97d-4858c179a47mr1569056f8f.51.1788508576976; Fri, 04 Sep 2026 00:56:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdema9n6/tPJ+BNd65DZa7ql020ZL00TvIUtWGXgzcmAvw==" Received: by 2002:a05:6000:25e3:b0:481:5ae8:2abd with SMTP id ffacd0b85a97d-485864d8444ls597249f8f.1.-pod-prod-06-eu; Fri, 04 Sep 2026 00:56:15 -0700 (PDT) X-Received: by 2002:a05:6000:4b05:b0:485:8c17:9772 with SMTP id ffacd0b85a97d-4858c17998emr1381834f8f.52.1788508574707; Fri, 04 Sep 2026 00:56:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788508574; cv=none; d=google.com; s=arc-20260327; b=RtKYmDHj2Y4YQdpyQpICk38c3QUhHdVu8qmG65UVmqXISAQ/OrIjjP+maLJh06AQbm D7bY6I7ivCu5Yj3EzdqgVIItEkReG3T1kfOdjRYRfjwaZXYiKKKksLv02tZO9ixE6jav YPYdMv1Ofa9KGwjEQABpiNGySi6CNsLQJhHTXtdF2SNxXrCh2RatTuYL6lfmd0Gl3vD1 n+zm0byr4tedgOeWlJ9twCYFyqgkoup/a8d9fMR16ug7npWNBuYaCojyEVw+lwrvgq9q tGud804j5vcDhYmPxYTn1khSBe1debBuhDtE8b0tYEUFJesdacXoTA6yA7QaMX7VhOc+ Ms4Q== 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=Pb17nx53D2NvJqqP5xnl4+2gn/g0GWgUhfme0UNqH8Q=; fh=2ALxNboLzDt503PhX56nFQ4pQzOkkVjVTCOSpqCio6o=; b=Ue7bCvxkmSHlMbyUvyfHfn3koClfeuP/Dlp20x/iGeKdSE6ZSQMJo/4/0oIHJhhlxz QihMOcMk2RYO9peHjUJA5MSMVCMoWRaTS6NVyutLQ3DsZPkVXzBboWQkNx517U4TP0/o FyzNm5jMdmdcowTuKo1ULK1hRAdhC52bElRgtdjGAp2cjSZSMWk3JBouo56XS2sTRwkC PQCk2E+Nmp5tUMeeImOigDy4d4L5Uy95HNnOu+M4UgV0vEaqR+V7D3kBb49KbVlRDJF0 NTdyGLWfrUY74au8m8ibXRGPQZUQoswBIrgrFgdrVQ7JQQxA8sYmlHVvsVOBpDoav6nb 3lUg==; 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 ffacd0b85a97d-48587b1cb6asi29514f8f.0.2026.09.04.00.56.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Sep 2026 00:56:14 -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 6847tRSH004124 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 4 Sep 2026 09:56:13 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [v10 07/12] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Fri, 4 Sep 2026 09:52:49 +0200 Message-ID: <20260904075515.25962-8-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260904075515.25962-1-akarpovich@ilbers.de> References: <20260904075515.25962-1-akarpovich@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,T_SPF_HELO_TEMPERROR 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 033b3b19..835593df 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -81,10 +81,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: