From patchwork Fri Aug 23 05:26:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3769 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Aug 2024 07:27:24 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 47N5RNT2001842 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 Aug 2024 07:27:23 +0200 Received: by mail-lj1-f188.google.com with SMTP id 38308e7fff4ca-2f4062343desf11517131fa.1 for ; Thu, 22 Aug 2024 22:27:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1724390838; cv=pass; d=google.com; s=arc-20240605; b=iIuzAUcqgmME5QuyUXVCwRCOWAfFA1GXvyY6BwpcubmgmUs+aUMVl0n0XdLU/+z40B yhCFAUw0QtSVS6Lr2V3daDRjxTyOBJavp4xyke6xOjDIqBYmsa5nJdjgqv2EmsHc1Ekv vxDGlzo+5ycltVB6OzwF+g0QK1aA4lBoBByvNeezGlMI3nwajihLDa/i1Rb76kL5tIdG ECU/0sqi8yK/+SJXwaJ1sTDcA+/2a7eCVcdY7+XulmwDJqL1l5wAZoWnnS6NEeg5bA7c GAZdHlctJ4LO+Kma/GCxB9Qwu6dxXEvg1cyIpAZ+II96usRHXNN4H4CzwjDZbmswrByn 5NuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=J1oUrR9MAhTujllvmaX/EDhxj0GLyLKWCS2OJysgE30=; fh=YAqQKwzAvQqIA3mRAhRN1sc0M69R6WJuvXhrstm7v28=; b=Mtxecn9f6NgSj7RVXKQDbDNfQCmdZWe2RUlcDxp6vkfed9J1ZgHy2VVPd+nWfSQk8J qcBgtfghaHnA/oQXkfir8v2QeC77sUAFMVY+k8c3tsRNtQrnM5OIj6CD//ignWFB+qtW 2KLB0KbIqDENPn/nlWcqO/m584cenRFpyBelgprQTfnCgo/F5XZHnmDYqOXxeZjxyXy9 lI+Ao0LceXQUpuMDMy2uaUKaJsPp9+bJ9h3MC1hvXibtTPoF/lwlHxzTZ1PwKk4RfxlX UCl9E0DdkdOzXlKVdF/PpeP47IyJpVyeDXCITKSVRLcpbxTuuf8Qoyv37ZB2J/I0YmQd ZSBA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1724390838; x=1724995638; darn=isar-build.org; 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:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=J1oUrR9MAhTujllvmaX/EDhxj0GLyLKWCS2OJysgE30=; b=kBMLC6RByfbAbN13aAaBg7Br711hs+4oJuWkLFJ72zC85NdqUSbTPrMknkdfxwFBtH WFrnlnW1iFoSCeRzQQAjx1eoWjRzcWjmQSlLlsTfGFZDLVFYddXXz9+sq4qRkGZd+pLG +lVmdkoriSDdSZgsg0hhdaNc2ypOptpeeGP39h38R2XyovpFssc/smtNMi8N3PBn7uOa lNDHn1pDK9B/DIE41fBvE5xQ4gXUN0GeQO3vhh5yOqZESlVEqGWHhHddg/IOuJtRLyYn 6lRMNSaEqVXePGDYj01pzsO18w6YjyqkPnC3aSdZt8ETJWiwSr3JSFKreBQbRbFW3id+ +G+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724390838; x=1724995638; 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 :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=J1oUrR9MAhTujllvmaX/EDhxj0GLyLKWCS2OJysgE30=; b=lQBT65a8OQKpquPROM6ZfGFKWz+36M6PO2xhIpv8RyfxafM3DB3z5V3+s8PJmT7Owi v0sJK04XiHSimhjRVWfWOZSXgQw5GHyThRychFzkhv7KgO5B/LlwW/39Sqxlgh+EzBWv YoX6g67ageLbgO2tTnHFyTcKdRspdJgc0ulZGJYyhdX8uhUHN+5r4GYOhFu3KmDiZQ6f By13z2VdyUYDCPCAPwdzJj2NoXqP/+D61tlT2dwKDZM5BfZK2YpcZW6bbGx2tkQPwOU7 qKZd1T7rxvmDCtfWSUzGS215w2SQdqJ9wE2rqgUOxsfhZbvGhaDaYXAZa5ienz7hrqZ0 saYQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXxvQl0CmK8EC2sAIxyEhMtGnn0VST5z9xwMzBJJna/nqAm/8lbW/nWMA9wuRi3yKy44IpdCrU=@isar-build.org X-Gm-Message-State: AOJu0YyA08pGO8MErmgXwz0M6qTZAnMKi+h+TW9/AD19zK2WpkMR60h0 D3SoebrSu0uzffbsE/RbHsOmoeILAOSII2gYzjHYkAXyt2h38rvN X-Google-Smtp-Source: AGHT+IHjnl5hJXVrsm+XUBGG+STdD9m4z9VMNkCXXRtVXe65M3s3LcSEvJOxgqRRu3hEIelS9ToNgQ== X-Received: by 2002:a2e:be21:0:b0:2ef:28d2:39cc with SMTP id 38308e7fff4ca-2f4f48d66camr5641711fa.3.1724390837014; Thu, 22 Aug 2024 22:27:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:6d02:0:b0:2f3:ee66:7c5 with SMTP id 38308e7fff4ca-2f402fa7517ls296641fa.0.-pod-prod-02-eu; Thu, 22 Aug 2024 22:27:14 -0700 (PDT) X-Received: by 2002:a05:6512:1256:b0:530:abec:9a1b with SMTP id 2adb3069b0e04-5343877343fmr565022e87.13.1724390834460; Thu, 22 Aug 2024 22:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724390834; cv=none; d=google.com; s=arc-20240605; b=Tdl3afcbmF39u9MnQOuPpDh0mD/gTUw16rRp0F0n6+yij/bZwjaryS0irvVI+btbiY 4BjUdnW9UI5MS3e5gw04PO60ZGpJc8E/pnFI228i7t+dEVBQN+ckGR9Ht+FiKJrSq2Vq pt9H7a73A5cFGksfL4jRNnNb/jp4ufARiwpN+93U9Tjz4tqGudcpgSWNLPu44suRoOmJ EKddiiWHnHnL6EeOVmbgqrnyEskervkCuVSxRdxrGJ2xPCOwt2qgm7AkR/Ih/teALkee 57UPDH4Y/A3TghjG9g5TCfbQvWXN3QJHA119NbRLYqJjbXn6y4B8K/a6MrdoVMtmpVNs W65A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=VysiwQHYIxqON+IL5anC9LT5NEEPRbkfOFUeIjKVYU0=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=L0F5nESPmcBGWc5ZSjPZnxZTXLAVwA0ttMsY8ShA0+gytYstZpTpMYDg7mBEH7GuWg NJy3PKddWiySxoksexmyW8yJhFrcAY6mX04BYhzp7qyS9RBAE6meqjQlEdL/CRq0qitu qzWMart5OxH+jmuCcmJDwVBOJK35QfpvqIDjT3Bjwr7hjnQ2Rd+zy7fhBWquTZbfdXDC QUqvDTeypjvF4qSPPjNGq+7XfD+/7roI9AYYjgNFezFoJhwIDOHeK24U30FJ/mGo9oUk dTFlh59LonfT77Lb/WiYehSUWI7NoVPMUQ1QaRBWjh1JoR10MhuWJjVeYSAvpb8F9w8S +jXg==; dara=google.com 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5334ea265d1si64028e87.1.2024.08.22.22.27.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2024 22:27:14 -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; Received: from hp15.localdomain (mm-8-3-121-178.gomel.dynamic.pppoe.byfly.by [178.121.3.8]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 47N5RCgf001837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 Aug 2024 07:27:13 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] testsuite: cleanup qemu machines left running Date: Fri, 23 Aug 2024 08:26:35 +0300 Message-ID: <20240823052706.25962-1-ubely@ilbers.de> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 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,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: ubely@ilbers.de X-Original-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 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?= Parameter "keep=True" in `vm_start` function allows to share the same qemu process between different tests. In case the machine is forgotten to be closed by the last test or in case avocado skips some tests (due to internal error or other reason) such qemu processes stay running after the testsuite completed. This change allows to terminate these processes. Signed-off-by: Uladzimir Bely --- scripts/ci_build.sh | 5 ++++- testsuite/cleanup.py | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100755 testsuite/cleanup.py diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 0aa2403d..b643b5a6 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -147,4 +147,7 @@ set -x avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ -t "${TAGS}" --max-parallel-tasks=1 --disable-sysinfo \ - ${SSTATE} ${TIMEOUT} + ${SSTATE} ${TIMEOUT} \ + || true + +python3 ${TESTSUITE_DIR}/cleanup.py diff --git a/testsuite/cleanup.py b/testsuite/cleanup.py new file mode 100755 index 00000000..c81397d2 --- /dev/null +++ b/testsuite/cleanup.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +import os +import pickle +import signal + +build_dir = os.path.join(os.path.dirname(__file__), '..', 'build') + +vm_dict_file = f"{build_dir}/vm_dict_file" +vm_dict = {} + +if os.path.isfile(vm_dict_file): + with open(vm_dict_file, 'rb') as f: + data = f.read() + if data: + vm_dict = pickle.loads(data) + +for vm in vm_dict: + pid = vm_dict[vm][0] + name = vm_dict[vm][1][0] + print(f"Killing {name} process with pid {pid}", end ="... ") + try: + os.kill(pid, signal.SIGKILL) + print("OK") + except ProcessLookupError: + print("Not found")