From patchwork Mon Jul 12 10:59:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1503916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=X0U94zbp; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GNgl8675Vz9sWc; Mon, 12 Jul 2021 20:59:48 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m2tf2-0007GK-Qi; Mon, 12 Jul 2021 10:59:40 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m2tf1-0007Fw-0L for kernel-team@lists.ubuntu.com; Mon, 12 Jul 2021 10:59:39 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id D992440614 for ; Mon, 12 Jul 2021 10:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626087578; bh=fTMmAKDVIA/90DdjiHojtFNfE7yOaNVfE1FLw9jmuT0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=X0U94zbpED2xm7pslBGYRE9j3tOmWduH9VcJTpgeQsR4R9RTKY2jRLoudlyVQgAGG Ka/whbZYRXu2bwao/XGBYqiczM9LiXfE750vRk/6qfLskP+lAoAeNJEaMfoMs93I9j NWgSgfkELnigHD+923cFAzGADd90sAkgge5BF7u8Nzve6R6Fs1N3j0oxHg2Oms6kEk 1YwDGrM6YtzBgcZX4eeZzICDBphnKkPnHoZFrczXZuiG/M4HAlp2ml1MxG2Wlef4M9 9fzrxdYDFiiyOmdCi1jDQHnoflm6NGT0Mq5Zblbuj/iu6T1w3rMFcRJGy2r+7JRvyK EUAPBXvhVl2bA== Received: by mail-wr1-f70.google.com with SMTP id g4-20020a5d64e40000b029013398ce8904so7008587wri.16 for ; Mon, 12 Jul 2021 03:59:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=fTMmAKDVIA/90DdjiHojtFNfE7yOaNVfE1FLw9jmuT0=; b=HHH41JFklA+bgsUVUhltP4PCMTUvsAsMxaADWk4WAsxy4vdsut/8c/Qq2lV8+6A8pa 5e+yw1p8fg38aQU9h54PEmP5NT53ctSbcdu6rwsYSLFjvWqcPgg/2fwPCvoxFQ9t+xie GFSANOOJfugCXfwsI2bKtBYbieKkepNIaeWRASpgqbFo3k/NiWqoTibmr1eBCmsub1M7 W/zRzEhd3Bwv71A3FQSKRxfaDtooq38YJpj0s5rnOSdgAKP6AuKYuX0mlXeNvJ8WieYH kxZw31COxdsmjUMPwKxQUtSFhg8RD0Idg3RqbOQEiWHH2T2cT5I24Fr9mOzQY3egifMY fMLg== X-Gm-Message-State: AOAM532ooyxvJz6mWXoQX12cMaJT3sMwZQyo9U525dE5i6RcgcjoqHp2 l7c/W0Me6P4BazO0HGpLF/9Ks4y2VhjoYegmeB25nk4rfhqrwGWrilhLL36LRQLnLJEhfJMh08Q dvH9LIO92Qv0nzTZCdTmrANuPe2dWXK8dj0UHB338cw== X-Received: by 2002:a05:6000:1043:: with SMTP id c3mr11404419wrx.13.1626087578528; Mon, 12 Jul 2021 03:59:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOzvaok+FLQsLFw7UuGpkicf1YzUC/bV+IwI6f3m9jdfGfdoT34GQRNW+gkb03uGY/aSnleA== X-Received: by 2002:a05:6000:1043:: with SMTP id c3mr11404389wrx.13.1626087578220; Mon, 12 Jul 2021 03:59:38 -0700 (PDT) Received: from localhost.localdomain (ipbcc333e7.dynamic.kabel-deutschland.de. [188.195.51.231]) by smtp.gmail.com with ESMTPSA id z16sm7624082wrl.8.2021.07.12.03.59.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 03:59:37 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH] UBUNTU: SAUCE: ubuntu_lxc: destroy leftover container before tests Date: Mon, 12 Jul 2021 12:59:36 +0200 Message-Id: <20210712105936.1937440-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1788574 Commits 1a50e77ca803 ("UBUNTU: SAUCE: ubuntu_lxc: remove the reboot container after test") and 298cd01e ("UBUNTU: SAUCE: ubuntu_lxc: destroy the leftover container before exit") fixed the issue with the leftover "reboot" contained on the 'exercise' script. However, this script is run only for series older than artful. For newer series, the testcase is run from the source package via 'autopkgtest'. Fix it by destroying the container before running any test. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Krzysztof Kozlowski Acked-by: Po-Hsu Lin --- ubuntu_lxc/ubuntu_lxc.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubuntu_lxc/ubuntu_lxc.py b/ubuntu_lxc/ubuntu_lxc.py index e201b0d4..cc8466ba 100644 --- a/ubuntu_lxc/ubuntu_lxc.py +++ b/ubuntu_lxc/ubuntu_lxc.py @@ -44,6 +44,12 @@ class ubuntu_lxc(test.test): def run_once(self, test_name): if test_name == 'setup': return + + # Destroy the "reboot" container which might have been left + # behind (LP#1788574) + cmd = 'lxc-destroy reboot' + utils.system(cmd, ignore_status=True) + if self.series in ['precise', 'trusty', 'xenial', 'artful']: cmd = '/bin/sh %s/exercise' % self.bindir else: