From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7324662718404755456 X-Received: by 2002:a05:600c:1827:b0:40e:44c7:3d25 with SMTP id n39-20020a05600c182700b0040e44c73d25mr3407221wmp.69.1705405937019; Tue, 16 Jan 2024 03:52:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c414:0:b0:40e:5560:1de5 with SMTP id k20-20020a7bc414000000b0040e55601de5ls714566wmi.2.-pod-prod-05-eu; Tue, 16 Jan 2024 03:52:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDhf7G/TBr1vzmH1M1Sg5Ji5YysZmfPiI1Y6eGAlc+M8HQnA+xV7Ij+vhB5rySmv+1+zcl X-Received: by 2002:a05:600c:4743:b0:40e:50e7:db2c with SMTP id w3-20020a05600c474300b0040e50e7db2cmr4003902wmo.177.1705405935079; Tue, 16 Jan 2024 03:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705405935; cv=none; d=google.com; s=arc-20160816; b=aGVjey/TEZF22o9TZa5OdqO7KAA9QQCDFRNIOy4Qm+DSkPG2ZtK4VUkcINWnO1QSe2 WC0M0ALStypX4f0EVOiTx/aiJlQdg6PWd5BBp8Bf+CAf7lr3J3Z7VGJG6LkFSaWK30lP oFSfgRksLyzac0MdMOCbDzVtxQ/pqDR0qCUceSqBHZcKlKn4bwAYmRguBrLmU0eaF7Cb UGdVGpWAgrrMtuoE1odh55i9cfLBBlbAiTRD7E9kGNV+ql/z6SEJqbEEzzyppsfd3Dd0 uJDf5zB/jTi1GqwaXg/HUwE0RDD+iiuv/YrA0PnrWAJrOuDw0uEnETsLua0fgCDt5Hlf /Oug== 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=v68+tY2NmakjBWdtehVgezthGuQR8KPyP8fSyLt8CwU=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=n3uJ2lpCqtpctqMLaliNi/PcQw4yRwfkR9fr59LZBUKHfn7ZT/C62mULX4GgBhF1a4 P1ETwlx24ba9dz2Nk+xrf9cDdg0CyVbzMOBJRwpWWpaohrA3SxMXaKgh63EP6t9ELvjK qs6Y+0wsTAoEyigBUs53KQbXeNCB/TrhIuclN0IaYtMoYTimMTF3xftO9GMFW8/zl6qX dkpZnkVJSM6lpfGA7EMT7Et4EeTYY6Ih8gLSWrTCKOa6/CvP7O10o2Iautxkc4l4iLP9 2FNOVs5Nf5rM/sG69HMkRh8bznGQ3vHpblvroA5WSb/UCk0WmDpWbnuxM3pKSWyE5awl kq9Q== 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 c6-20020a05600c0a4600b0040e657c8b72si287800wmq.2.2024.01.16.03.52.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2024 03:52:15 -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.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40GBqCDL027366 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Jan 2024 12:52:14 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/2] CI: Avoid removing logs from tmp Date: Tue, 16 Jan 2024 13:52:05 +0200 Message-Id: <20240116115205.537399-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240116115205.537399-1-amikan@ilbers.de> References: <20240116115205.537399-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: olb6+dqefjfc All the tasks executed during CI run should left their logs. That's why we can't just rm 'tmp' folders inside test cases. Move them in other locations instead. This will probably increase maximum disk usage but improve debugging. Signed-off-by: Anton Mikanovich --- testsuite/cibase.py | 16 ++++++++-------- testsuite/citest.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index adeff205..90591f32 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -45,7 +45,7 @@ class CIBaseTest(CIBuilder): try: self.bitbake(targets, **kwargs) - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_middle_repro_%s' % ('signed' if signed else 'unsigned')) self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, sstate_dir="", **kwargs) self.bitbake(targets, **kwargs) @@ -80,7 +80,7 @@ class CIBaseTest(CIBuilder): # Field that stores direct ccache hits direct_cache_hit = 22 - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_before_ccache') self.delete_from_build_dir('sstate-cache') self.delete_from_build_dir('ccache') @@ -89,7 +89,7 @@ class CIBaseTest(CIBuilder): hit1 = ccache_stats(self.build_dir + '/ccache', direct_cache_hit) self.log.info('Ccache hits 1: ' + str(hit1)) - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_middle_ccache') self.delete_from_build_dir('sstate-cache') self.log.info('Starting build and using ccache dir...') @@ -101,7 +101,7 @@ class CIBaseTest(CIBuilder): self.fail('Ccache was not used on second build') # Cleanup - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_after_ccache') self.delete_from_build_dir('sstate-cache') self.delete_from_build_dir('ccache') self.unconfigure() @@ -117,7 +117,7 @@ class CIBaseTest(CIBuilder): # Cleanup sstate and tmp before test self.delete_from_build_dir('sstate-cache') - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_before_sstate_populate') # Populate cache self.bitbake(image_target, **kwargs) @@ -158,7 +158,7 @@ class CIBaseTest(CIBuilder): expected_files = set(glob.glob(f'{self.build_dir}/tmp/deploy/images/*/*')) # Rebuild image - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_before_sstate') self.bitbake(image_target, **kwargs) if not all([ check_executed_tasks('isar-bootstrap-target', @@ -182,7 +182,7 @@ class CIBaseTest(CIBuilder): self.fail("Failed rebuild image") # Rebuild single package - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_middle_sstate') self.bitbake(package_target, **kwargs) if not all([ check_executed_tasks('isar-bootstrap-target', @@ -195,7 +195,7 @@ class CIBaseTest(CIBuilder): self.fail("Failed rebuild single package") # Rebuild package and image - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_middle2_sstate') process.run(f'find {self.build_dir}/sstate-cache/ -name sstate:hello:* -delete') self.bitbake(image_target, **kwargs) if not all([ diff --git a/testsuite/citest.py b/testsuite/citest.py index 7be2b86b..d7ece76c 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -162,7 +162,7 @@ class WicTest(CIBaseTest): targets = ['mc:qemuarm64-bookworm:isar-image-ci'] self.init() - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_before_wic') self.perform_wic_partition_test(targets, wic_deploy_parts=False, debsrc_cache=True, compat_arch=False) @@ -210,7 +210,7 @@ class NoCrossTest(CIBaseTest): self.init() # Cleanup after cross build - self.delete_from_build_dir('tmp') + self.move_in_build_dir('tmp', 'tmp_before_nocross') self.perform_build_test(targets, cross=False, debsrc_cache=True) def test_nocross_rpi(self): -- 2.34.1