From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7084101336361336832 X-Received: by 2002:ac2:5922:0:b0:46a:2396:f575 with SMTP id v2-20020ac25922000000b0046a2396f575mr2553109lfi.654.1649395874269; Thu, 07 Apr 2022 22:31:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3813:0:b0:44a:9ec7:d611 with SMTP id f19-20020a193813000000b0044a9ec7d611ls465540lfa.3.gmail; Thu, 07 Apr 2022 22:31:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi02GgwJht8oAP4+M3XSctx5eXVLOYyQQto1IKv9omJEp5HjdY2ZWa7ERrtOalISZhU3j0 X-Received: by 2002:a05:6512:230c:b0:44a:2282:8e38 with SMTP id o12-20020a056512230c00b0044a22828e38mr11758777lfu.315.1649395872992; Thu, 07 Apr 2022 22:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649395872; cv=none; d=google.com; s=arc-20160816; b=U819aPiTazbT+d3HYklK7q42xeCk0dW6Xix80lpUrT1y7nJHPsKl2zlXKsOAU6hDSd tLtzXJtQkQw1JiO4iDRfHhbAUwIWv6zYP9hsAwATFILdyNCbuMeFzt5aM7qXJvWVqe9e Pkn3iwKgctDzLKIUlmsx575LrwmPHyaHQ0pmFf0VWqxfvcsX6LYhgvzAmppFQP/jA5+y vNksuUPMSe2Mkg9vfzgr8dwuBFo3GcDB3yBKgwuQj8j25OQGaLb7mJSXbj4VBcVuRFYw Samv+zGJ20f1H38RIISlMBa6dJHLA1tDwcsdVy95pm/h0+BuZl+mCNZ+wHHgh2RBK5ua nk1Q== 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=oq3p2pvojfcaW9vQ7zfSA+wsNAZznsR2aYnLpM9ZjI0=; b=g4sn/lQe1PROQtgV9Ood08LeMoLXIQ5Qz3XrMVZWYg04v/UPlk2+YcLxzP2jObmpK8 w9qqM2LF5rWAYQCPrmi2o6cfZn86NsmEF/OwOuUx5Ej8Ht+gT0i4ypYsiK+iFUBuZ6hm kdiRO8RDG9S/cvn87lxQHBc14UK9zzx8NoivXt4PP6aq004uUsNYnffwxFZeIFLe2/zU S24KMFGO+zAkSW4tcLH1S57nzUQGQWo+7AK5hZkhMMyHoyBpq5BQy5ZjtTuzffu2RA4U jPj4hNme74bTfWqdolLpereOiMaITsSWN/DbiBwTsMMq3Xc0FYL5tiaHmcKxf0BDh0yD 7TlA== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m10-20020a2e910a000000b0024b4c741806si18916ljg.6.2022.04.07.22.31.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Apr 2022 22:31:12 -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; 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 Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 2385VA5L006475 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 8 Apr 2022 07:31:11 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 1/3] ci: cleanup tmp after repro test failed Date: Fri, 8 Apr 2022 07:31:08 +0200 Message-Id: <20220408053110.10416-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220408053110.10416-1-ubely@ilbers.de> References: <20220408053110.10416-1-ubely@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: P7D5qqGL/vCX If repro test fails for some reason, "tmp" directory is left dirty and may impact on the following tests that build the same targets. This can cause errors like "Release signed by unknown key" because custom distro keyring was left from the previous signed repro test. Signed-off-by: Uladzimir Bely --- testsuite/cibase.py | 3 --- testsuite/citest.py | 10 ++++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 0281be41..4a942ae0 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -45,9 +45,6 @@ class CIBaseTest(CIBuilder): # Try to build with changed configuration with no cleanup self.bitbake(targets, **kwargs) - # Cleanup - self.delete_from_build_dir('tmp') - def perform_ccache_test(self, targets): build_dir, bb_args = self.prep('Isar ccache build', targets, 0, 0) diff --git a/testsuite/citest.py b/testsuite/citest.py index 8f47338c..5d4cd0aa 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -31,7 +31,10 @@ class ReproTest(CIBaseTest): ] self.init() - self.perform_repro_test(targets, signed=True) + try: + self.perform_repro_test(targets, signed=True) + finally: + self.delete_from_build_dir('tmp') def test_repro_unsigned(self): targets = [ @@ -40,7 +43,10 @@ class ReproTest(CIBaseTest): ] self.init() - self.perform_repro_test(targets) + try: + self.perform_repro_test(targets) + finally: + self.delete_from_build_dir('tmp') class CcacheTest(CIBaseTest): -- 2.20.1