From patchwork Thu Jul 25 15:07:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3727 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 25 Jul 2024 17:10:27 +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 46PFARHZ007210 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jul 2024 17:10:27 +0200 Received: by mail-wr1-f56.google.com with SMTP id ffacd0b85a97d-36875698d0dsf660637f8f.3 for ; Thu, 25 Jul 2024 08:10:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1721920219; cv=pass; d=google.com; s=arc-20160816; b=nvP/udQNVCLLbeaw+sqkVWsMNMTnR/Qp0VaZgLjQqf/mTNe+oo1+G82UahRx9RADTC tB+wdYjvgjtEaik5gUixpjFRezQPaxAspDJmTdOerlI1OXtcNpiI69hhZpKUolgttVkD HAc19VG3LLhrwY5JVOsMXEedcDLXsLxGHYMlwfWRCmqDn1WXUxBtA7qRPLIL0IQPUpmE xxrNHrtz/ps/U46yQtmZA7PPecD9QM2rMSwQ0PUUErMhjbLggMdf8GGbZ2NUceaiQSNE plvSctj4zL7PsV5JhpRjMBZL+sIzxWVV7wlpO0dkVh76vsLSl1iZTwlE67ISJ1BmimGq LGrQ== 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=twuyw0ijfCGWzpyXMbP+5J1M9G+701CrpKmUh5dX0sc=; fh=bYPYIHM2mFO2JBHDywHrmPMznow7AnsMu/Lqw5A4GAo=; b=WL4SPAEDOIrDWnNZFJWjOx4g3nlh9ECoV/pZFc6r4OmutPXNaZxMjUw/M/0YtXxrXD 7J0j4q2Sp2yE/EkQorZFMiJDC790iZvIG53UU8zhcEqOoGt1WsbDxtcgs6YZGWkGbOn/ S7ZXXn1sneQPhg2a2ohMBtiOrNm0Y0XhFzJfLdWRe1nCCiezvnC2v7DHtpfaEPZVySqu r0StDAwBTQfDQQSSrXwEHylrSvOLjxuuSGsssrWt7rKnD7SANqj9p34cBCB/QRkhyNXw Ol9b5zTo0/6DnE4evs87WsiwROivj8fQhcNZIfm2agJJ5NsmWwLMfcWdaJt48XU/gy9i ujTA==; 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=1721920219; x=1722525019; 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=twuyw0ijfCGWzpyXMbP+5J1M9G+701CrpKmUh5dX0sc=; b=rdrWCnZHqay+tOF05o/5onCn/zJ+XtynXxqV4l7kQ53caTxt8gKyfINyr4K6L6PXuN tNboQHcBUq/QCHJDgVtAxLG1bxKyl7dKWBOKhXbaKONTlnUCYON6UNuiUf34Js4HK6wC SSEX5zGwgOY3htj+GB6rbFQgE0X4kz2G+qQQFTdaSNPlw8S/G0gYhhleLizegyj+/MJ7 wmKToa6TwwsCa6aq4jue4ks+/kDnJub0FHgQKxkrkh9w2+DVW7C/5gflllsBoYSeBrNt G57Ct4xxgusO6NJfkQZCkX3MoF+r2UsdtE7O3nY7T4iyJGnNougM5idPWP8dTMezd/ZE YwPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721920219; x=1722525019; 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=twuyw0ijfCGWzpyXMbP+5J1M9G+701CrpKmUh5dX0sc=; b=dfU5J59p+N8l2fpVA8zqgjofnZHluT9GbJbD/+p0AZUqTZroW7l+l6fiJ+e/VJBDVE alIJqvwBe17Kuk/aRlQ81H/BFoZ59Evgc1mH6UuZ8azIv1+RjBhbTUvfP12KFTDcOEzK 4PD2tPg9UW9A+duAjNWtUYRZhb4clNwU0Av5O1tskzQlaJfCyeOtE17Kb5Meew+nvhYo bbCk4Cj2jtgclwLu3jDyCKVJYMTIrTUYs9neiBIbI3Ksz3IwLOdleHnvrd7BAu87tmSg EiLzmyfK00eQdlLcDncvI8xXhZXO2V4XKbm6FetDH3r+0LKCvt7iSjI1ENw82cUNKJxa VZXw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXMXDnT4ESKdnlnd3W1tDv69cnwfZnukJb1uAGtrHZ3nzpPA5OH44O4qgx+mofBTTdOszp86BKTvS+r71sG1rQu8zdgQB0= X-Gm-Message-State: AOJu0YwNSFYa+QW29eTla2w9S9QBQ98pn+xLYQegM7bu9Ir5nD5vHZ+X 9zAcAoEDRDQtsLXndV4BgK2vhNV77afqy+KaGgsQG3RlmcJGmCGH X-Google-Smtp-Source: AGHT+IF8nyEG795JivoKpvnvpHoY0zjMwfIhXl/2SaJOpTozngn4sYf1atIHW3Ui0Jhe6AVYEHzkWA== X-Received: by 2002:adf:f185:0:b0:368:6633:c54d with SMTP id ffacd0b85a97d-36b319f306emr2458852f8f.35.1721920218725; Thu, 25 Jul 2024 08:10:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3ba8:b0:426:64c1:8974 with SMTP id 5b1f17b1804b1-428038880c7ls5132245e9.0.-pod-prod-01-eu; Thu, 25 Jul 2024 08:10:17 -0700 (PDT) X-Received: by 2002:a05:600c:3591:b0:426:67ad:38e3 with SMTP id 5b1f17b1804b1-428055040abmr16807335e9.3.1721920216681; Thu, 25 Jul 2024 08:10:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721920216; cv=none; d=google.com; s=arc-20160816; b=YKDmbud5Gj6uzaK+A2L9rIy6J+41zWoJZI9ZM+t5oEj6d/sFmLgFdQc85pXcObf1pk 8xhCG8pckS6GSRsRnS8FqBGymYHqqew2x2Z4uC1Tpp2iXQSscl/iLQ5f9rApWZKa7tCs 3HCAXRUtnMTJvWYa4zUX1O16nvcomLEFJOWEIdElxt+c8fwK7DSSPqcMqp3xd7Jhup+T ZMZ5z9183fzjc86pCSd5Y/30TEwB2DTaNMOdMVKnJugDjPS2zga080HC/QRqEHyk34Sw D10Uu2Mwwz1jBCn8KkrEE2UzrTrG+FOZPXfuRCtATf30Qwaz1pUaLmOZaV4gSm3qyYAf 3OZQ== 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=5g5T4rlflGN0ik3uAI29bUKTlfYegoK+GsqfZVwVr2g=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Zy+d6aDHYyQdMI2xjD3qAaN1JxxM6pYOxakf+CEd+MuZkzmSS4wZnnJxQVhly/1lf6 tJvDxFSR35ttrsqZAvpzQc6x1n59aupdO5svvCg3Urhzid4Ri3EUF4W7MclIGBUJ0su2 fLhNiC4EN24tVY8NnONEm/mhxe++EOJ49cgwUC44/E3X1RGEaj2Ku3/qXQre8vArUF+k J9SYdVJFibSdnE9F9sQvMKoMmBSRQGk7QwepREKM1geKPQKlSbYENCk+bVqu5V1gFkVv f5X9jqqDFk0mSpitqenPvQUm9iZC4KRRELOsVVwJa1+pgysx8pI6HohQ9YtiLQsY4eCA hpOg==; 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 5b1f17b1804b1-42805a57f47si364625e9.2.2024.07.25.08.10.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jul 2024 08:10:16 -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 localhost.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46PFACKd007063 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jul 2024 17:10:15 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 07/10] testsuite: Set ISAR_PREFETCH_BASE_APT by default Date: Thu, 25 Jul 2024 18:07:39 +0300 Message-ID: <20240725151006.2129-8-ubely@ilbers.de> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240725151006.2129-1-ubely@ilbers.de> References: <20240725151006.2129-1-ubely@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_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: 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 b2a804b7..f5eec864 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -45,9 +45,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 a20e88f9..3b3d8708 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' @@ -121,6 +124,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 @@ -169,7 +173,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: