From patchwork Thu Mar 14 07:27:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3412 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 Mar 2024 08:32:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42E7V7JR021686 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:31:07 +0100 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-513c9a5fe33sf934113e87.0 for ; Thu, 14 Mar 2024 00:31:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710401458; cv=pass; d=google.com; s=arc-20160816; b=Jo+9ODzPXd4ntlMKg0u5WrvooM/6mnnTb8BSRnkOWsQ6f5JdgLbBzMAUc2tihUGVFy boUakFKr93aKTUDwnlBgfiyqdOfEOZj9ZGShfr0BnX7+YAR0vTrClxwqGQFz2SCkOkxt YNVJHiBu+J8CEpIEF4j+VOOGtufw8mYoIt8TXCoC+p/LFjj8gWzvUpBt5IvVmPB8qRQs 9J6QVE6WH5w/0Ep4LCKsYczjjif5ZY5i1Pz2w4YuDAq8XmcUJLfDYknkJMP1PymimN88 C1oA6Ey57K3s9j/3RSlcmtz/CHvwA236qZbJMPXeSbTLczRK6DQOqXwdLwUnIdQ84Puh VtlA== 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:to:from:sender:dkim-signature; bh=Gu/KlcnkJaoICYvihH/1HE1qbMDebqk17uoGAB6oMd8=; fh=h2Z3E+A9mv2PgZJzpSc3WLYbQ5Vco8h4luuWOaGL6cE=; b=dMz1kS9Ekyn1k97SYlu8TvIfOP9Lo864IW4PoZ8we0/RS43w4ifzdbbPf9U7V9utlo 97S3yzdoukfQXH+Z1xS38lvcZs6bCVOilGrmI/wlrLim+qRmgGyGkcnoxTn9mtaGilkL I6Yj6ZLgB7OHbEikhsCu+l/uy43Vkl9FuTcGMHbgAcpFfV+vPPzjKX144s7ntCo62lj5 LwoNk+bTOWE9LLzuaqsl1tr2jpiB+jCw3g/l5LNrpxNfD3g6omPQ/MVsQ3y/vXVEmqYP QnOY3XbQajYGfyVVG/jmKCQhKO9+Nx0CROpcZgkujbGjDbtd/driQskkSd+CYHK2qfUP KYEA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1710401458; x=1711006258; 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:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Gu/KlcnkJaoICYvihH/1HE1qbMDebqk17uoGAB6oMd8=; b=RMZ/6OuFW1WTslYOABm2ZH53+/Z+vNIPJ+ZfR11uqCt4qa+k+m0YZNAzG68liPenes yCGQodqNgh0fAqbWuJBG40LBf5Bb4xPyExlNT5oziVVVacQf9/KrvTCMpauMxf9tmtT0 k0H324lnkL6uZ05wrsY25Udvk6PzySfBTx9F12KUCwXfDM2YBSMil5U/TqGKW7I0kha2 AOQ+RRxN8GLa+wRQfaNft85oveGZEx0kEpNtpLoPgWiSKh4R7Jw8VtYUX43xphmbte+v 82P2oDnf29GQqeD78vpk/Fj/XAbUPCx+ZppdNAZpClP/K0926rEC11uSOAAX2El+E2xY e2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710401458; x=1711006258; 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:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=Gu/KlcnkJaoICYvihH/1HE1qbMDebqk17uoGAB6oMd8=; b=KirUMsZMzDDG1FfalX38iXOzznyjj8Er+2cpLivXATzEdGIOyF8AKd2ne4eMNATzxH YqxDJNOP3sORvWQYKAStntfhOnopgbOEgltmr3HdRpueO5bSGYxocjtQx5Qc+wrX04jL zXgsTp6E5IRuL4UGqnr7cjayNl5dsulJhhTrgQfeclafSxvKH9Mm6JVs3Ak6YO4tnnkk LGvrD6Nu6yD9wDglAq7h1xREveupTItiKfOfk4LOt/ZaKpbLTBSKC/3TZRvTNgWEjiJs gdqLQ/KIEyidORECSGatjcVEpmHNfVpFJpUkUaFGeIZN3/MAzvJP+K1Kne+TE2VwgBkg JnQg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV8wFyvmXy8vhjcqjSzxPVKYDggrZNpk0FGerOtdca166tWG3lmYTegVXr/iBtFpA80w4Pc/SZaN62YmlHRzjH0xV2uexQ= X-Gm-Message-State: AOJu0YwNXwZe2bOGXC1n6orkQXewE+jMFgiqmK8kwbA3hWlcMC0wlgU9 7puJGua0zx7DsjZa+gGZlDIb1gJM7Bkid4iSHlD5qfkAq7BqsYlV X-Google-Smtp-Source: AGHT+IGuoT128rwSWvdAS8QxOuaVn9Gz8iJKMMjnI9xCIOmhCs2ux9PuDuN9sk6s99EGtkwFxCGZLA== X-Received: by 2002:a05:6512:3288:b0:513:cf81:488b with SMTP id p8-20020a056512328800b00513cf81488bmr478083lfe.25.1710401458029; Thu, 14 Mar 2024 00:30:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:47f1:0:b0:513:4766:2710 with SMTP id b17-20020ac247f1000000b0051347662710ls160766lfp.1.-pod-prod-00-eu; Thu, 14 Mar 2024 00:30:56 -0700 (PDT) X-Received: by 2002:a05:6512:10d3:b0:513:cc74:bbfa with SMTP id k19-20020a05651210d300b00513cc74bbfamr1262841lfg.9.1710401455672; Thu, 14 Mar 2024 00:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710401455; cv=none; d=google.com; s=arc-20160816; b=elYL8c8D1zHH825S0IlPMBijZZ7s4mUgP8Zc/KGFOkRG+E3Bo6W7pX9DTBNyHbV1cr s10ep+11/vp+jAu7TkYO+Mpk82G2cjO5gLfcjleDy4thaZ9+VkQ1fwfsf7CMZawJSPYp jEvNA1rmM1WS/ustAV3j9Kp88c67E/gnROZqRc+2fuWpH7GYjL7e+aWC54k8qCT26mIy BRlmFV17SLvTt3uErY2KTUYMVLBb28/DKfB/sQ6iWfPIm1nKXilHF7VI9t3R2Kb+k9v1 w/BJsnoPu4czhHXzNitucjNuGC1XRqKnJwk1qCihqExdjFjFSXuqFPsCWMZwSMZaBDQ2 Xz1g== 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:to:from; bh=iI+9Ab5nnVukWMWH2xIrqNtQNulEGFCu5dNluVXlSuI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=EJQtX6Fyw7VOxYMrZ4qkh7fOHHhjkyURlSVaNIinwehdeJ543z08dqCyEhbPDue8cw IOURF1Nyhrf7ffI7Ta6JhpNzEib9zmA6JmQOuXROb6qv7tBKqfUfO/umcNAQFqUHyMZu pMmX1xZew4V3CyYLI072oId4oK+He2bR/jte//KE9mToyCbOVTeFeWOHzRqB2l57fjab fdU0r7H1Nu6cjFMFPjvoHQA48Szc2HZ73yOw5ogPgWFAYPFPv5e7nYdrbT6U9qGiOmyV zLJzHg/yj+4pN1IofHaInTU74jfFTqdohyk90RifMa+KsCe+GvF7ihlk+ik9JxKVoW7F U2ug==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q1-20020ac24a61000000b00513c1ff7958si55572lfp.1.2024.03.14.00.30.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2024 00:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from hp15.localdomain (mm-209-185-213-37.mogilev.dynamic.pppoe.byfly.by [37.213.185.209]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42E7UoA3021482 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:30:54 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 08/11] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Thu, 14 Mar 2024 10:27:25 +0300 Message-ID: <20240314073047.29465-9-ubely@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240314073047.29465-1-ubely@ilbers.de> References: <20240314073047.29465-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 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,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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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?= 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 | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index f692f533..941d7cce 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -34,6 +34,9 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" +# 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 90591f32..74f6c971 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -43,9 +43,13 @@ class CIBaseTest(CIBuilder): self.fail('GPG import failed') try: + self.move_in_build_dir('tmp', 'tmp_before_repro') self.bitbake(targets, **kwargs) self.move_in_build_dir('tmp', 'tmp_middle_repro_%s' % ('signed' if signed else 'unsigned')) + + os.makedirs(f"{self.build_dir}/tmp/deploy/") + self.move_in_build_dir('tmp_middle_repro_%s/deploy/base-apt' % ('signed' if signed else 'unsigned'), 'tmp/deploy/base-apt') self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, sstate_dir="", **kwargs) self.bitbake(targets, **kwargs) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index fa30c2f5..08f82295 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -104,6 +104,9 @@ class CIBuilder(Test): # get parameters from environment distro_apt_premir = os.getenv('DISTRO_APT_PREMIRRORS') + # 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' f' compat_arch = {compat_arch}\n' @@ -120,6 +123,7 @@ class CIBuilder(Test): f' sstate_dir = {sstate_dir}\n' f' ccache_dir = {ccache_dir}\n' f' image_install = {image_install}\n' + f' prefetch_base_apt = {prefetch_base_apt}\n' f'===================================================') # determine bitbake_args @@ -165,7 +169,9 @@ class CIBuilder(Test): if sstate_dir: f.write('SSTATE_DIR = "%s"\n' % sstate_dir) if image_install is not None: - f.write('IMAGE_INSTALL = "%s"' % image_install) + f.write('IMAGE_INSTALL = "%s"\n' % image_install) + 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: