From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7097485294514995200 X-Received: by 2002:a2e:5744:0:b0:24f:8ac:2e9b with SMTP id r4-20020a2e5744000000b0024f08ac2e9bmr4969723ljd.482.1652512074642; Sat, 14 May 2022 00:07:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls6028346lfb.1.gmail; Sat, 14 May 2022 00:07:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7a021rPueVcFnZgnDjZqdqsuNlbYkR+Pvp4ascXgVs/oRnBEzQI4D0LKLOwb3HNY+dTd2 X-Received: by 2002:a19:ca09:0:b0:472:4b5e:b324 with SMTP id a9-20020a19ca09000000b004724b5eb324mr6043657lfg.620.1652512073570; Sat, 14 May 2022 00:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652512073; cv=none; d=google.com; s=arc-20160816; b=IzvkQV5an2+drQv4JQcx2NMMJPGxvHeAV6CR/5Ou7lDUFiK7/bc68ItdwELVJiK6YG wIMChj6amQO3aoY9t/JJWIRqx/chx4dklo7xH2q6y6+MlcSavf113gYB0GweahsUkS/V E4L3zNAzUQD38Xg1Adj0t/oJJlye43Mq5774GcfCh7yPis7EXxUr54j1KDuHlN9u3Vwk H3ilzOQk+pV9endyVN4WtnzHE36pfjzg2hcFT/71DsHMNFuzi0WZqwaPh9yJsYF80jy0 xKKiKmRcNIvU+knZFqc/g/h1KmvzrdxM4W8L0m2+bSk33KMpmPgahmTsE7m7rdt8n3yG FQFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=8SsYjJUZ9mqWpznEMizfNPZ00EeZqVeEIkSbqRsLUvU=; b=lPtJ+YjxKiGf9Q5EEjWu4e7+3Ehu3AAn3BSz7EGVzieSUY60A0jVVyjUs7oYJ74J/9 8MOiw+5O+W/ZjGJP4klqMFJgJRp7gHSlxlPiRv+czzy+SdfD7dMAYsqHn0Yt2v6CzART XjqJdkgnquVHXHC4aNv+dOd7Uu0NPnloR+d5mXncDGd2pzH/ZnSP2llwQ6ZquHHFDe8C SsbJSG1ZE4BDt5rpB3abbZakIgOL+40c1X0XBb5qyM4RzY3NUiQDaOtgMA2QPqPGkDiW QvxMcpBkSWearyDeURDS0keMiwd5BnvlrtzIOyrlbQedq6tdkF5ZcLRTPVwBFRJkdB05 gvjA== 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 k16-20020a0565123d9000b00473a7dd2de1si227758lfv.5.2022.05.14.00.07.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 14 May 2022 00:07:53 -0700 (PDT) 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 localhost.localdomain (mm-235-31-214-37.mgts.dynamic.pppoe.byfly.by [37.214.31.235] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24E77k0B025368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 14 May 2022 09:07:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH 5/6] events: Cleanup lost schroot sessions if any Date: Sat, 14 May 2022 10:07:35 +0300 Message-Id: <20220514070736.12997-6-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220514070736.12997-1-amikan@ilbers.de> References: <20220514070736.12997-1-amikan@ilbers.de> 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: RN94bm6OoYYg In case the user will only open imager schroot session but not close it we need to find and clean it up. Signed-off-by: Anton Mikanovich --- meta/classes/isar-events.bbclass | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index 92aff20..f1e9dcb 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -4,6 +4,8 @@ # Copyright (C) 2015-2017 ilbers GmbH # Copyright (c) Siemens AG, 2018 +inherit sbuild + addhandler build_started python build_started() { @@ -51,6 +53,22 @@ python build_completed() { basepath = tmpdir + '/work/' + bitbake_id = d.getVar('BITBAKE_BUILD_ID', True) + sessions = subprocess.run('schroot -l --all-sessions | grep isar | grep %s' % bitbake_id, + shell=True, stdout=subprocess.PIPE).stdout.decode('utf-8') + for line in sessions.splitlines(): + session_id = line.split(':', 1)[1] + bb.debug(1, 'Closing imager session %s' % session_id) + id = subprocess.run("schroot -d / -r -c %s -- printenv -0 SCHROOT_ALIAS_NAME" % session_id, + shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8') + if id: + subprocess.run('schroot --recover-session -c %s' % session_id, shell=True, check=True) + subprocess.run('schroot -e -c %s' % session_id, shell=True, check=True) + if 'id' in locals(): + d.setVar('SBUILD_CHROOT', id) + bb.build.exec_func('remove_mounts', d) + bb.build.exec_func('schroot_delete_configs', d) + with open('/proc/mounts') as f: for line in f.readlines(): if basepath in line: -- 2.17.1