From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7203376969598107648 X-Received: by 2002:a05:6638:10c8:b0:3c5:139d:6097 with SMTP id q8-20020a05663810c800b003c5139d6097mr3857422jad.5.1677166907689; Thu, 23 Feb 2023 07:41:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6602:2d0a:b0:74a:f1e:fc8 with SMTP id c10-20020a0566022d0a00b0074a0f1e0fc8ls3300049iow.0.-pod-prod-gmail; Thu, 23 Feb 2023 07:41:45 -0800 (PST) X-Google-Smtp-Source: AK7set8aCudf0Z4l/8uIhGLqWSlGFDdR2z2PhtNbysoxol6dx1wbkbQpWrbgMMny4b+YRu2+jwY7 X-Received: by 2002:a05:6602:25d5:b0:71f:d4fb:d611 with SMTP id d21-20020a05660225d500b0071fd4fbd611mr3754487iop.14.1677166905685; Thu, 23 Feb 2023 07:41:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677166905; cv=none; d=google.com; s=arc-20160816; b=JnKsEVmNNXRmOI+t6Gl9KPrlOb0Zf42onqi+Y4V95cN5dnVs5zT9EJRysfaZvavH2b mJvTzVd6/a4oQOojfr0xO0ycv1a1Er/+yn+c13tomLS9k+VAphJLaZBHoo9T+ZsAJPvT 76irMY1v1AhXbAoKfl1NuCSFlMGn5EjKz0zbgZEpBj1bdU+8ru7R5TFjfthKmGlPzkRg 592GiKg8nR7NGCKcBS9xCDMJAwdc/os6NdWOH481rCyyo6QfKCEdNOCs1jL0VuMRbbeu owYKsKvBGnQbx9ST3uSEOZXH+7PauiM1fiymS/A9Itsx1dHgeWUTrwpXqiTyYZtug/xO /Fbg== 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=eg3EZ3+lwu4QJNYXVjnt85PpBvZOwiVC6NZv/RzUux07UuA6arfMneCbydiqq5+49o ugqJprUlESD0Y0WDy1ncYrIvj3BJsv8oOVwGDgjXi40DiYSWXp1jbwVmS6W84RSZo/5M /TPs3Zhc4KQWMJMmJ+2ccAbv4l3T4KGRi36AEnCUKu9nuJUvCAPnuWvPv1pO81+aBXmU Rl2jG02oSHI15Aomq0PK2qoPwbFsa7jQkpE+3uJsTKceC/6OOvaPe9k1KJ1Cd5USHPFc IGtoOCGC3lbs/vt1WojMMItqjUUvTLWmWxX/YTd/nqxKsRskZAx7pPJCzcDfS51HLszC 8R1g== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k133-20020a6bba8b000000b0074080b81253si788995iof.4.2023.02.23.07.41.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2023 07:41:45 -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; 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 Received: from user-B660.. ([85.254.74.12]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31NFfWLT020691 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 16:41:43 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 08/11] CI: Enable sstate dir sharing Date: Thu, 23 Feb 2023 17:41:28 +0200 Message-Id: <20230223154131.132362-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230223154131.132362-1-amikan@ilbers.de> References: <20230223154131.132362-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: dpUIn7mR8hhE 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) -- 2.34.1