From patchwork Thu Aug 20 13:29:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5394 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 20 Aug 2026 15:42:12 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 67KDgBeJ014048 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Aug 2026 15:42:11 +0200 Received: by mail-lj1-f189.google.com with SMTP id 38308e7fff4ca-3a17b9d389esf8894921fa.1 for ; Thu, 20 Aug 2026 06:42:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1787233326; cv=pass; d=google.com; s=arc-20260327; b=jM69RZYHi6Lsw87E8RkiwMB+20f35Up7A7sgKioBPxzPQdGVj1+Ud+jU8IjRu8iKeP frAiOQcroAdPjBJSWXm2iMR0QgR7MsZgIuoNbg5MEJqNgML5W70qMKH6kNX069lnMNCB 7C4hmY6RQV0jNP2o6O9Cz1ZunU7eUJ9iuUq2j2c4IahYA/Cb6PN05L25e0p3da6+IekO /n/HHoS4OET/Kywm9L+FbBylK0PzynPCbW7UoKYdb52pYUxUzjxSZ+HdzkXENRNiEsNR W1dGxd7CzILSOgPyq9tLAWdW4MkTPLndyJoDNuD8XmxDa+b+Iz5O08dHKaw9X9N51enf d9pw== 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=GsWhdeRM6b8xlHXVVRvR91B3/j1cKNOLHAF3hlHMosc=; fh=4DwTGQMLNyBrBH6I4bX2j0zsZECzOwaLPj6LcpYKv30=; b=K6OLySRBxKoIlTC+FvmazsrpvbyIYbRW2PfQBpudVj90skiafOWEkwkLX7olu4IGAa wSmkSgMlMECLvMDeumahJrnXfN/AMyOoiFntfUMW6GO8QZUTWtDjKaI9F1O4zGjsnW4/ YRN/pWR9XU2/K60mFRGkyXhZbpTc2ATdsKhK+cIcjPVw5MNLUhRF5Q4kR9uf7BngFrTp mlHkBQ3Xib4ig0meRMFWY29OmSDXObdxNYLs/j2EPlmaPk7eKVwVPNDU/PpRDpg0AonL 93vckhfSUeefXxXJBueDG/v8+c6QLXIPHEyl6I1TtwMQsSA4jG99ACwlbRQ7gfHu3Yu1 br0g==; 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=1787233326; x=1787838126; 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=GsWhdeRM6b8xlHXVVRvR91B3/j1cKNOLHAF3hlHMosc=; b=Y7ODrDq2nK9G5eTn0Ej8uGJotJMzpG/x2aQgW6EvdWFX2nn8TSRGurrcq2mGFg+k81 NfxAE7TK1eCi65RGxp/s+zg3Unmpamc2LM7BuDDYXU98NmQlcnWv13VnTf4xR2T4cbgm R446t/c+RsB0XuxwIpn++aS2Jg5kDQICicY7su4fpWfurHVivaBB0QQRl7/1E6/z8FJl Cq89WHVVB388AlfRMZrjY+CotV60G2sxn1LOWuQhjN6XgbqjyvriR5R1NDa3UDowL7ZA SCF/Jt6+dSqzNAG7sbtqcbFnakGfLexcIZk/te9aT9jQB0pdvRf/+6f47Uo8zKlzsNfB RTpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787233326; x=1787838126; 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=GsWhdeRM6b8xlHXVVRvR91B3/j1cKNOLHAF3hlHMosc=; b=XNvKbSu/A+T5NYlbMDfuZusFtjCBfQwSe5qa75b2p/I5ZSlD4pe0dhgxgmQg0jYeJH 8pGk7KDhfr21CjYoFTsbSIGQ/rJAvUWgrTyIrIFHL3bqbgxQvHj6+LjRxU6nOEE60WST Z6fx/6jAE24O8UuaNJjzeQn8W0ZGngrn425LL8e0U0D88eKdT/CMABqW9TkJcDcPi/lS +m2U17j2jLy8Un4eSH+8CPoW17dR5ShIWd+tU0Eha0tUgPMXCaPMVGXqvonasL87Hsrv MKbAq40Vy6H9cQGtXWn9w0wDVVHpxm/DOsRsOnLatDk62HAC2lwo2DY5gEBi1urjQPIR TXAg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+RrI5BijRvUarMxPg9I/C9fdpbeECE78iT87bWGmImhJbD2hNtKheT3nxoqRF/TQDFEgCRBf6Bg=@isar-build.org X-Gm-Message-State: AOJu0YyPnGZg3HthiZvii1NEl4YBf7IRyoKXQZVZ/k+RR65E4Kxa5U/F 7vXDNafvLkLuszW6ad1hwN0aGHh1s9tM5rZ0GlKJlSjBBwtL1pCo9dFy X-Received: by 2002:a05:651c:a0b:b0:39f:27a4:8037 with SMTP id 38308e7fff4ca-3a1896c5227mr28836991fa.5.1787233325111; Thu, 20 Aug 2026 06:42:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeVlagi6IfI1hZQxvwH+ml6TnNzEDPjJxy721Jt1YYigQ==" Received: by 2002:a2e:950d:0:b0:39e:e6a4:c6d3 with SMTP id 38308e7fff4ca-3a19601b0d6ls3278311fa.0.-pod-prod-02-eu; Thu, 20 Aug 2026 06:42:03 -0700 (PDT) X-Received: by 2002:a2e:bc29:0:b0:39c:7ae9:daa4 with SMTP id 38308e7fff4ca-3a1896d0353mr33502431fa.6.1787233322466; Thu, 20 Aug 2026 06:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787233322; cv=none; d=google.com; s=arc-20260327; b=Q+jETCCeOsiUfh+peYsy0ZIAcsbgxSv2BM+zRqrxR4eiXLQJpUXUSezczNseEp1Nms WZ+/ozbl4Ezkagwgj0WsD9Sj2kP2GZRY9xBUTmVvD2ZX2bmQdBgCvtfoRcULK78kfZz5 wJSGD20VhiibW3cjoJf1T8IUIRCVsAaqUMlxw57VI6z6MNQHHV+QjSf6GzlVxn9mhXrq tvTtuMbB+x9slL6h0L7DZB9vTnqnqfGRDtnvmRadvgWDcHYONzhTEavgPUoA56b1cB9o jVlVKdH3PUqF1N8OwPWxbeWvtB/SvFHMk+nPL/MAgBZrxzgm1kJV571Ty/iuX7zAi0jP V7Zg== 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=IZBEswC4toSgM3PT/UOG2UfdFtYnV+nmFuAUqOigwLQmQ7bWDL92oVoZvmBnQMzq5K 3ETycx6Rb7yj6oMmIPHIZrC4Umcj6qoqK9XUfrXLABzKjMW+nwmVwUVssH33U5fB5DJp CGw+qph0b9EBZJjk9BQJezGbkukGTEG5ygG6xpc4z4hPUuKEPhwzbWnclQ5Q0fTMOtiN kIja3WokZgqk16Xs1RdEisZMjimv8bAS4pVshEWFcPFeuOJxsh8c+n2vBMN2T6ZxhV6w geZLZTxAV/fjRtK1ebkKv3dVANZQPA01N48KVV+vNfnvds4GkrPFvKo/cnYQy3TfGtQh Xcsw==; 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-3a189e60023si1085841fa.8.2026.08.20.06.42.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Aug 2026 06:42:01 -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 67KDf8lU013513 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Aug 2026 15:41:59 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [v9 07/13] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Thu, 20 Aug 2026 15:29:22 +0200 Message-ID: <20260820133934.383231-8-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260820133934.383231-1-akarpovich@ilbers.de> References: <20260820133934.383231-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 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: