From patchwork Fri Mar 3 14:47:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2721 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 03 Mar 2023 15:47:49 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f64.google.com (mail-ot1-f64.google.com [209.85.210.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 323ElmoV029296 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Mar 2023 15:47:49 +0100 Received: by mail-ot1-f64.google.com with SMTP id o8-20020a9d5c08000000b00693d403480asf1292737otk.3; Fri, 03 Mar 2023 06:47:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677854863; cv=pass; d=google.com; s=arc-20160816; b=08HasaedZOf7YenfunMMt9UuOwJ9tqMy1+/BInZ+t+o7VvjB+EDAOLUQEENa6lfH3o Op9tcr1RH6YpnHXTOe3nIKc9lw2k6bGiDwqFrBmGE0mvUnqwfq+mc06seAKaVoAi8nla DaCv/Lk+TgVJ23KOTsLsBSvRbMTKqrz5SwSXCeynF/kTAPrcq7/XE5ddmJhSNUYbBBok zd5+ize8o369ULekqqVERt5yxHA2PnmC5l+rjEGwxb7OgCJjaz7HRtNdUoX1fRn4+uuS JdAk69OLd5mYaBKInO95taWxPE7wr6lhRWm05Wv6iHA4/Xlrnb1iDTcnuFb48kLJHEcv EYgw== 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:cc:to:from:sender:dkim-signature; bh=y0IB6JaO/CG32TtZQYnsdq2Dflt7TfKlN8GbIVkWeoI=; b=spXg+5hlq3K96iTLwDCsv0ksNCTCJbxGp2Sn/6yjkwBX7sNzuPoAYwGxFyBVd4N6Xm 4QcYyED1VUoQiBQiOv0JvdCzvzIDil7mugs8i5Ln3Wt9cdN1PLjDm1un6NU2N8q7ZVZf zDHThZgPYttQ60aYeY7d3dtrJ5UjxHnYRti2xOcP81D2Ek00fnilmzoL081yEaOEV2CW 0irqdFU0JXwPmOV6mdSUuApKuOerm1g08kT1xaFD8FbCQGxD4qMaXj+PeyhJVCD/SYew PF5Avr4A/F7p10rNg02ugMBlJqj6sJxHRxpVE22KZ9IoF7hRal9Yc/9Z9IKudI+n54Qw JOMw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; t=1677854863; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=y0IB6JaO/CG32TtZQYnsdq2Dflt7TfKlN8GbIVkWeoI=; b=b8ITb0Yo3QERLhXw0ePrdyFZ2P3nhVIDekNj3grkpj0If/Sg+TpSaFqJoU2fECHxoH oL22yt4AupCBrQQVCriYAujEusEIxIL1RAi9UUC3AEDZtiogb9+ObAGQaJS41FgUESHf ylhe7ByCmhzfVzHxxThY/hlvs8Ug4Y3uRkNHD4+rCn03SN9QOwtPsEYlZjquz9ERropq hWe72MZDBh3AFC12RZ4fWpkYcptNNZrcVJa7uUQFcMrysokhvNEzhblxwSrlfmg4brL2 E14KJ35Rsc9YPuWIZYudbMVlzS63TwJcVVgs/DOFSnUz/7eFFmRq5ScVAdsjgHBpcexi ax5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677854863; 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:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=y0IB6JaO/CG32TtZQYnsdq2Dflt7TfKlN8GbIVkWeoI=; b=VKlh7zAHxkgcyHKefwEhDK8EKUG2Kj8uqyefxQNk/QXZK6d1VYlgH3PCsC6Qc+2X01 cn6gsV370qFbtopF/L4lE1nnJhwUVo/Hw9eRsXy6iiy6akCNmDb3X7mj6+H3Fvqmob4W MorIj6WHRHjES2AUFRbtjgtVdHGuiNyaFZQQp5BhvmYRzFDjwhfi8VPfLTUnS00939Zb BlnoxobdktLht6nEzHSaYksLzm2OhZPrnlg8tsfwRI/PEFsiRXx0fDCPNExDpJKi8jUw H7C01QqZLESb6gt/232Njhcx2rhpZDU7WMHmY8eQIEgK/MO6+NQbdbzLiN9pFW0gQaNr LOPA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWVZaB74khvAsVGdq/YvHohvTFZq2PwwYMW34+/AaV+WAAh2WoF iy3fxx1BYFFPJ/SE+HeqpaU= X-Google-Smtp-Source: AK7set924dYDCl6D0F2CAHNKboM5pGh26hvuscjwq4Pgf45LqQwJ0BySE488wKdJ61CNeqHkNGKAwA== X-Received: by 2002:a05:6808:118:b0:384:23ce:10e7 with SMTP id b24-20020a056808011800b0038423ce10e7mr578810oie.1.1677854862846; Fri, 03 Mar 2023 06:47:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6808:2124:b0:359:ca69:f473 with SMTP id r36-20020a056808212400b00359ca69f473ls1101337oiw.10.-pod-prod-gmail; Fri, 03 Mar 2023 06:47:42 -0800 (PST) X-Received: by 2002:a05:6808:251:b0:384:637:a4f with SMTP id m17-20020a056808025100b0038406370a4fmr815335oie.10.1677854862428; Fri, 03 Mar 2023 06:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677854862; cv=none; d=google.com; s=arc-20160816; b=ntnI0bZLEycJD0/MrXzoFboa0XkDcKq/hjx0irEh8K0yB2k9z5pOU12ydywHFzySM6 NoE58mTCECiWHCOmj918Tetct45ZtPy2J0GpwHVSb1tth4wSTQLLdxnFZ0bxRk49eVvu 8VdMs/c68tA0Z4e106OizozNf7C3MXCbBXtpu3FbjvVZB8LCZV86j/5AzFRRvoxmxCNu wTMVZf2cq/NEyE4RTK+YdkhcRehBgCAEBquqjdA+gPJsfHHs0wvXyLh0bxiY83Cw3fRA zbcfvXdz5gg4gjETLG8whu2ktoEhvN4iENRXK5crK5Qrv6TcLhX8fFgXwy1uY+yVP8vh /uJA== 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:cc:to:from; bh=JZCpuScroDYvcKh9Wg2EF1QdxRVYsKWawQl8sWKXMLg=; b=nY9QEzggzhyLNuOWDtUA8TVXU/aYQygtEQ5L4zprWuZHSan4EHujJJUd+Dg93K74kY dWMi9yC1N1qmYJMEZ4Qfk1h7N5gCYvkVJocFQruetmAc8R8MZF7/QgfmYkM5Vo8qJPTP cOoBknixnzgI5aEWVh85/9ZMAAyu2Kt/HBLcje4F32Y8D3S4j7VYPpkJjPYy7mFPwLI0 HG3MdPIWv5aYX7Ximn2qs2qI7WZEG8G56WjLn2hwB0oTNeWVx1r8YZwIMFNows3T906C xuyOr35nsf+xFDteLcaGRJW56BM28pcPnNj9Jfs/53av19LC+JsDh9WGx4lDZ2wlPgbT TNIQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id es19-20020a056808279300b00364bb6b07e9si154549oib.5.2023.03.03.06.47.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Mar 2023 06:47:42 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. (IN-213-226-141-166.bitemobile.lv [213.226.141.166] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 323ElSpv029181 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Mar 2023 15:47:37 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 08/12] CI: Enable sstate dir sharing Date: Fri, 3 Mar 2023 16:47:23 +0200 Message-Id: <20230303144727.481716-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de> References: <20230303144727.481716-1-amikan@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: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@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?= Test cases performed in different build dirs now can share SSTATE_DIR. Enable it by default and disable sharing for cache-related test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibase.py | 8 ++++---- testsuite/cibuilder.py | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 6239b4d..3267c17 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -31,7 +31,7 @@ class CIBaseTest(CIBuilder): gpg_pub_key = os.path.dirname(__file__) + '/keys/base-apt/test_pub.key' gpg_priv_key = os.path.dirname(__file__) + '/keys/base-apt/test_priv.key' - self.configure(gpg_pub_key=gpg_pub_key if signed else None, **kwargs) + self.configure(gpg_pub_key=gpg_pub_key if signed else None, sstate_dir="", **kwargs) os.chdir(self.build_dir) @@ -44,7 +44,7 @@ class CIBaseTest(CIBuilder): self.bitbake(targets, **kwargs) self.delete_from_build_dir('tmp') - self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, **kwargs) + self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, sstate_dir="", **kwargs) self.bitbake(targets, **kwargs) @@ -67,7 +67,7 @@ class CIBaseTest(CIBuilder): count += int(content[field]) return count - self.configure(ccache=True, **kwargs) + self.configure(ccache=True, sstate_dir="", **kwargs) # Field that stores direct ccache hits direct_cache_hit = 22 @@ -119,7 +119,7 @@ class CIBaseTest(CIBuilder): return False return True - self.configure(sstate=True, **kwargs) + self.configure(sstate=True, sstate_dir="", **kwargs) # Cleanup sstate and tmp before test self.delete_from_build_dir('sstate-cache') diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 0a07bf0..ef46352 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -58,6 +58,7 @@ class CIBuilder(Test): def configure(self, compat_arch=True, cross=True, debsrc_cache=False, container=False, ccache=False, sstate=False, offline=False, gpg_pub_key=None, wic_deploy_parts=False, dl_dir=None, + sstate_dir=None, source_date_epoch=None, image_install=None, **kwargs): # write configuration file and set bitbake_args # can run multiple times per test case @@ -66,8 +67,11 @@ class CIBuilder(Test): # get parameters from avocado cmdline quiet = bool(int(self.params.get('quiet', default=1))) + # set those to "" to not set dir value but use system default if dl_dir is None: dl_dir = os.path.join(isar_root, 'downloads') + if sstate_dir is None: + sstate_dir = os.path.join(isar_root, 'sstate-cache') # get parameters from environment distro_apt_premir = os.getenv('DISTRO_APT_PREMIRRORS') @@ -85,6 +89,7 @@ class CIBuilder(Test): f' wic_deploy_parts = {wic_deploy_parts}\n' f' source_date_epoch = {source_date_epoch} \n' f' dl_dir = {dl_dir}\n' + f' sstate_dir = {sstate_dir}\n' f' image_install = {image_install}\n' f'===================================================') @@ -124,6 +129,8 @@ class CIBuilder(Test): f.write('SOURCE_DATE_EPOCH = "%s"\n' % source_date_epoch) if dl_dir: f.write('DL_DIR = "%s"\n' % dl_dir) + if sstate_dir: + f.write('SSTATE_DIR = "%s"\n' % sstate_dir) if image_install is not None: f.write('IMAGE_INSTALL = "%s"' % image_install)