From patchwork Mon Aug 26 05:15:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3773 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 26 Aug 2024 07:17:59 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f183.google.com (mail-lj1-f183.google.com [209.85.208.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 47Q5HwgE016911 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 26 Aug 2024 07:17:58 +0200 Received: by mail-lj1-f183.google.com with SMTP id 38308e7fff4ca-2f3f9517948sf35717611fa.2 for ; Sun, 25 Aug 2024 22:17:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1724649473; cv=pass; d=google.com; s=arc-20160816; b=Ui3RC98efiBGona8ghwkLhtJgueQZzsmquXMAQrGi9mKivmCHBZaWj75QTmBWNTzVI SZH9aLcmG+iSJIerLBDwQhxBDEGGY5LoB77G4S+v4M4xmZQpb7xb5AsesSgnwD8I2JtC Ts+/kK/TCar6+QFzWgcC5Pj8w7x/CQlds/DROfyApJ3+DJ+HXG6HMDLtvhufoLYeLgK6 U1CimOtmLfF8/j90La+7eVXSrVRi4oEI1cCDmyPJXe0DIKB+rQ4NUZVVCYhDehDhDUqG O3Y1y3jsYt77CfTha45EVHcOWBs16rvGUSSzqwOqTEyUB/l1hvzoNUo7fVR1A+lUHI6s thLw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=twYoP+GbYPOUm6medEW35jtZiWkQGrCVmzm+WIEtTFE=; fh=x7SJxa8BhmmJLSB4dAhQ8wxC3DcP3zYSS9xCXcYoyss=; b=Ueijilt4Kx6T9Rbr2H2pGcyfHF3xdMj472adKjoEwJuVzVelmdgWWCCYxcSYvLNioz muhBDOrz1Nw/wzBCefmr5hVx1BSi1YmDoZFFOr0DVsuI7an2xJOaURvlsgXeFW946ZvY 895l5Bpj0/ZAYszuBCC2MRN3y64Sf6jBnuKCSW21U3Yt1f66+kz2DDD9OEKpvNgbNk5W BjuzJfIWADWCNxJQoX/Pa32RfndhGEGcqlqGIf4jyeV27a9coRnPrUEEcEKOJf2OaJmB +8+jPBeHOoloEXywxVc2LNQB/OH5GtAsjAMBK+4tHeLoU7vNFPC+b/QEiAnUn+pvIZ+7 viPg==; 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=1724649473; x=1725254273; 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=twYoP+GbYPOUm6medEW35jtZiWkQGrCVmzm+WIEtTFE=; b=FfvYEn9IDipSnX97KwUFStbEhARsBYBOuAFTNSzada6lc7oMOOs0vVQBEKHN8+Bmt/ Ug7MjJ0VxmZsE7tKnoItDAedueTCiRO/RBJyH3f1DiTP9K03VMjjCjGcpVT1QrrAFqFC Rpnr73lJwAXQPbVgmezJ4EmoLS2VjaIOJrTz7nzkOqaKKUQI0KiBXTXtfL8iQspfbVnu R6aU6IuMQ3qHzCRLonPUAbsCvTUXKnWYIfGAkp6xuZCN7HJvu2YJB+pVT83rLLV8qXal JQ2nFsS7WJWTatsKTIfHSMaMxfnXRM+vKZPJ/MqCMQS2wHckZfVBfNR5C/LjazN1wkO8 3AqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724649473; x=1725254273; 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=twYoP+GbYPOUm6medEW35jtZiWkQGrCVmzm+WIEtTFE=; b=QuJKF+g9Wnb3mocnErYrmLmAFUNitAVjJRm6l2BPg1RDvDlhdLq5PfEJPSUSzY1ygl WYyA0MQyxzi0YQ5+8ItcWR6dZyfesqNOmPZgzHY7g7ML2VECJuVofkjhmA3q0RQ6CjUD qL1IHTx6IN5ZeqKdcJBOCMugf6gfCvFsAROT7fG/RuqZR4X4KCIaeDWl8asbXdCS0rrZ J95A37Hdnd8j06tftqdL0mOC5vtK7bkwRK7z87NShIN17UDYzfvOWFOoDEbxvvO04KJo ZlXavmRC/y8Wup/gEaLhX55zOPY6ynBo8zrd4Xj/5jngxJo3g5MM8QTg969EgduPohI3 lROA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCW3dcm3QDgb63nYfg7nEwDnsV0ViBivBgJO3D5DfvuE6JEh5PZNbr+CWMDs9pWAVdTvPGD6/SE=@isar-build.org X-Gm-Message-State: AOJu0YwemsQz9cpBuiJ5LWUbr9043xHKKbD6PugPExajkhbJrIYraDza bQMlryqzWhbmn+dZ7I6eAchcj3bA9TtZ3DY927ajbcmUHsHBfHij X-Google-Smtp-Source: AGHT+IHKEArtPprrgrwjWpjoOl5F+lWEg2mqbt0w2BnysmkfU+a2aeMcbWlLYHRq2/TUlKbjaZGLFg== X-Received: by 2002:a2e:b894:0:b0:2f3:f193:d2d0 with SMTP id 38308e7fff4ca-2f4f4937908mr67188331fa.33.1724649471893; Sun, 25 Aug 2024 22:17:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:22c6:0:b0:2f3:f220:2807 with SMTP id 38308e7fff4ca-2f402fab7d5ls12250841fa.0.-pod-prod-07-eu; Sun, 25 Aug 2024 22:17:49 -0700 (PDT) X-Received: by 2002:a05:6512:3188:b0:530:ae0a:ab7a with SMTP id 2adb3069b0e04-5343877ab85mr6152986e87.17.1724649468603; Sun, 25 Aug 2024 22:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724649468; cv=none; d=google.com; s=arc-20240605; b=ZOTQFHZHua93YCgEuQZVtHv6MvDxvaLxSmPoyswy+OUaqRjFztyDISNAvTUY8H5gka X6W9HHvdr4cYknLGdgneLKqzn0evyZTr1dAuQKfpCIwaR9NuaNXmaozuGZDxydIUC0N0 unklHfGuFp2zwZp34kjnErRgfZrvaIkSFWyO54XlTjQwanYIsqa4pFlywq4179dtgseb vk9Pssgi99Q7H5YOCG7ww/IA0Wyx1DjxC3pP5MiCOOKTNM4G1DbXqTdGOqWKDupgRg0Y ZIZZLMrlIRKZuyNc8nZluQZ5jUgqpoFXmBnweQnO/JGAT93Ffx03IdVJqVn7o2DO2qFW VW8g== 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=h0HIkZg+CPkhwvBF9Q85DrY1dsqZw23muJ33Os3uMAg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=KdZS3JdeZ7uLrZ0iorF8Wmk3tR/d19PL6X38B8OXwCrGm6xzAUZdX3vgStXivhIGbr ivKfzFJRGID2oLeuL5xhcHZDr+wMLlHOZxmHPDF7dHWpEfX187eG/cgCN6OBhevQvKMt gMiOd0UZjM5Xnsiw8k9l/0eok+RzMbPaXqXvW4bbCE1zJKRJwLpdPXG+dLQABS/jEtuf 59IaoSIJLmvJRbnHuesic7El1SsdE7YJP2tn3Fhz//8PwG7LtrBxeokOp20ReARTpUob FVf8/XRVz9GAG9phcjexGVWt47i573/4DaYECX1Qg+mGN5D8p7FTHU1b6duiwGsNuRyp OBAw==; 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-5334ea247dfsi182639e87.3.2024.08.25.22.17.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Aug 2024 22:17:48 -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 (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 47Q5HkN2016905 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 26 Aug 2024 07:17:47 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2] testsuite: cleanup qemu machines left running Date: Mon, 26 Aug 2024 08:15:04 +0300 Message-ID: <20240826051741.624-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 | 9 ++++++++- testsuite/cleanup.py | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100755 testsuite/cleanup.py Changes since v1: - Preserve avocado return code on exiting ci_build.sh. diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 0aa2403d..338557ad 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -142,9 +142,16 @@ logs_dir = $(realpath "${BASE_DIR}")/job-results EOF export VIRTUAL_ENV="./" +ret=0 + # the real stuff starts here, trace commands from now on set -x avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ -t "${TAGS}" --max-parallel-tasks=1 --disable-sysinfo \ - ${SSTATE} ${TIMEOUT} + ${SSTATE} ${TIMEOUT} \ + || ret=$? + +python3 ${TESTSUITE_DIR}/cleanup.py + +exit ${ret} 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")