From patchwork Thu Jun 11 06:13:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Heimer X-Patchwork-Id: 89734 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71D46CD8CB9 for ; Thu, 11 Jun 2026 06:13:48 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.16]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.39387.1781158419335035151 for ; Wed, 10 Jun 2026 23:13:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=L0jK2W18; spf=pass (domain: est.tech, ip: 40.107.130.16, mailfrom: anders.heimer@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vBpVndk4cNrA+aBN+v1uF4Oy+ad82YT2kbWBpDA5xqGk0z1Z4gOeKjUSoYcLoPSudYOBRpR9e+vnBAcWW4Wo/OX6WSpiFeIurRjHMGMoqP35AEDfvhzmqvCuapR+loSSa7P5FWhtAS3YWxauVbfRkFP3D5Caqm+EqBTnUrmJ+xOT1lwtHBYTa3EXUlBnMb8KYhDPRgtKGwcSzjZR5u3BE5bjH9G4xF+/H2s5JA4W6w4UFObVyCIJjZtzR3wZ6BRIAi8L0GBJDfrAuWSGCkUjYpzjTUmhR0uoo0Mv7pY7Dq7WNU+dkyXjaDC+Ov3lJJRQLzZwgA/nMKKkMUj+I+KGFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=atvF2ul/mSkG8KCeGfKXrNDMnePDmOYqtNyld9rIv9Y=; b=qIFnYRVLe35MQjlr67Jhkdxsr/1ShcuRSSnAYv71pMhKQzgLTdmztzK/VQJeKzu9zIBURIynqYXQnT6AqCi6IDuG8AlIS0ZZhKBuMbyDXzEko5wa3yPhLUOthABor9Bxe+WG1psabxdWP/bQisCIhEVE3VWcvu72Aw1ymtRBObNOsOs08QR67iAt0hq7B0Q+j6HyAgjV6Ec+q5YDox8xn0CV/bOR62m1DPTzGgH49ukpNQdTOTyrW8aPh2MUdoSqmWDyK1SmAJJMvPsFtovnC1IJtepF5jEbbXED1vOrOyx914jmJ5nIHkLM5Yr6GXnPwIK9iSSKZHD16Owsb8luLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=atvF2ul/mSkG8KCeGfKXrNDMnePDmOYqtNyld9rIv9Y=; b=L0jK2W18Z8KFIsuoqSxOc5miSLzVsqGAiVRqQGewD7S6LGQ7hpzOx8UKK6BVPnerIXT6Xshyx13U3ti4bJ9mciQiwFIKXCjeL063K0n7xkDCCAYu0TgRht/Nl1vNTHUvBeRLtID84eR3veC7rard5Yy5ato+x5wulCYAh1KFrPMQHv4x/CgqXgBw7eA7s+dNQBrfWE2SBLE5+foXiv6Y7SS+1e4Vlm5BNm8O4Kvi9DwaUI+D7nQbTOGJ6game+8X8CB6MfVu4KTV7eL/CdthSLROznoWTKgrKVwH/8c9TBuu6oPcRyw2uYON5Jug6ifNl6oE7xEJl8M+8SSpSkm15g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) by GV1P189MB3003.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:263::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Thu, 11 Jun 2026 06:13:34 +0000 Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82]) by DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82%6]) with mapi id 15.21.0113.013; Thu, 11 Jun 2026 06:13:34 +0000 From: Anders Heimer To: yocto-patches@lists.yoctoproject.org CC: anders.heimer@est.tech Subject: [PATCH 1/3] steps: avoid shell when writing repo metadata Date: Thu, 11 Jun 2026 08:13:28 +0200 Message-ID: <20260611061330.733392-2-anders.heimer@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260611061330.733392-1-anders.heimer@est.tech> References: <20260611061330.733392-1-anders.heimer@est.tech> X-ClientProxiedBy: DU7P189CA0020.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:552::30) To DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P189MB1641:EE_|GV1P189MB3003:EE_ X-MS-Office365-Filtering-Correlation-Id: dcd2ae73-ae93-49a8-cded-08dec7809189 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|376014|366016|6133799003|22082099003|18002099003|11063799006|56012099006|3023799007; X-Microsoft-Antispam-Message-Info: iRrEWUVR8883HOWr3D7n9xwx2aTvJJjR4xqRax+b4ntI2vbnuNCD9/ZZYkx5k2V2x4Ig3wK6YPMuHKg16SiIwyxrYxmBudyMcEHBdAgBI3eQz6YmDhdLKX1BzEIWVZGeOIem2l0mG+6Xe8hKBK1LOCu8XrUJxbH2ErlLf2maWqWbzMza9PN5RHz66BCrjwACS1QqTUTdQwQKbOE71JySJ4qstwUvZxQKzZytJDONrXMfv5H1Zty4UnTgLhXf7PI4wngYWBmw9QN2bKrjJuFSyDYizRXjYRYOWMYC9Hkqqhmu+573nI3KXeOjYULuE0ehgIUq2vqEwrjy3wJLIVG+e7KpHmYRUJwe5sB4/2BK0FaMhXc7o1X7KlmxgwCemseM6swAKUsIAlRIK6H6LQI5bO6EGGz0FOO+/EvxI97h3wUv8abS/KTZQduK54D9hBFp9uheuPYxHwG9cUnjIBAp89sKgnBrFYE9H50PWySZTeModXOLszuSpMa0brNHHuFAP0muF8bLVvrQ2WAzvUd7BuKdpj8HAVg89viPmXIG6mYKP3EVSL0uJwPWkRoT62QqOrJxQOCI+7WxyCxOwRUJ9waSZZwKvHgYS9k10VPF4uyQ+zIOwjP7TEfXTS3sdzYgVXynv9ee16GQoHKv0LA1EBwlK/xi17FgvONVZY+FD82ZJjr1GgJsEIb8Kb+kEIBk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9P189MB1641.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(376014)(366016)(6133799003)(22082099003)(18002099003)(11063799006)(56012099006)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xGncwpp6oBK5VIbPIQxGmuaRBOlFufxAcsyDnYlKoOtiu234tMRAuV9RoX1ly2UIXuFIeWB/VyufC0dlCZD8BNBH/j2Erd1u4lSCIZURRTIv0tWD9wzpOKwEm7zbKFVyhLd9RT8QwEUCfxdFqMLBp2QwSF4dtrHxks1N2ek9kjasIj/+Of2uTmsJ/GNn87U7j4kcNLBxrJ6c65EAiSi/HLpN/y4YWS+gufzNT/3wO2ZH2ifrqV4wvPI1/hUp+uf0wXjXxI0t1Gv/B1fJ3SnxiROV2yjqizmZgHw2efICIBaEqj6PL4TsZ4CusPRyaAZfkn4eBs8VgMBrY0xvwrD9CwaYoMWtRYAyASfuGf6Nyl9S3zhp4yuKzv6z0/c1uVX8zTygWHHtrmtyRssSU5+Il6Dq1fvCpINpsBP0BfhUQgGcLst3icWh+1wA2QTlf9YjlL79DY9Ea/pW+2vcQbHIKknqjXRyNJqQS72ovVOKxS6mDJQX/WxdPWEblRCbS0vVuLyTOL1YWEpVxGMhdr/XYofJH/IHJNsldi3i7LKu00bnBCdiNktm1brMv3g8HLWs6kHsBNDTagPrB6GhF+lSp/RBSu6qmmVGvx24drx2fDwaORT7GI3QqbEGmXEA+0NphRMTcTdWVYFy3BEorANeFDB5HOzxH/hadL5gCXMONiJzBGpOsSSdNlKgGoT47sdS8BYotYPHk/6BOgwW9ZypnFAIfzNa2FRaKKIUI5nk4rQHDjUxncKXEdmK4cQqzQmeFm7i7jW2AwpwrtQH6bnCS8bQRTXIL0MX4pYdJQ1L/fEdpHOmzFv89eCekO1mR298asrC9kAAGX4DwKYZttXY/0qRrKA1BgjQTTOpjkFg3F9967s3VsL9fiCb89MmJSOzMdZJCvwwiwyS0yqKFA6Gictn5VTBx9f2VCq8BPpWXfD0kfSdERqqUfgfqLoSGQPXzDMFOMGef5+ePp49FvqAgxfbTIKEywGYnuVLToWcLqrcywEWLk9fE7mEAAgPJWLx/fSjByiApCmcb+z7FbFn6/DhAmkifAKWPgbGXa8MMPKddPqJxdC+/+OWBRxMf5EMJBYatF2chDNjxT6arebk3uuLJt2ZLxw04NwEZ8EDDQN2eWJ7cnTil0vxwg+n8s5Avama6q+cmRS+Np9xe1YsmmJy5yfPDl+qDXtvuvIT6NlvE/DJDZk09xgofyze9kb+Ft3oTxkHO+bvsurJgPGJwfnX3Dqy627oh/qCvqq/IHRB+0Z7JYWr6y0vmVq2XTrzD+5dJRA8DTAyk42Gl1Dy3razTOeyN2T02Zzd16nDxjw4rXdee7l3aVaoMyd9posoBAb4aTBuuJYAIDYgjsT1ssik7NNi8iQRQON+q2czrlgXazKqvtVGnNO0iSRujoXVeVDGNjICi4j43tmI4vltXaDLa+xhpUTxFVDHVQksTdy3qqVobSuzK62Yi4oy9LyENGhqok8jjkAHcg2TfQSM1SaUn85DnAFMDU/OcrNBsZBGLNu6cXkSAek0r4DDdpGDbLyex6vtmerJ5dqyj7aRh7hGoaHPevsQWVIcN28pEefD3BOHQpzNPPgO6pyUXN0b9l+5z0RqHJje+hKMnp4DKTNy6Pd9C0P4zC7TsyehRqP+c6rK5xEDns5yB+C4BfpGegcvU0xQIGMgeiFfVzC6GmkUPleqmpYKD3OiJlNc5sjvWvqYHmGtQG40RP82NR1vZRcgMLH1JJ6yuwsUCWrpsQ== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: dcd2ae73-ae93-49a8-cded-08dec7809189 X-MS-Exchange-CrossTenant-AuthSource: DB9P189MB1641.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2026 06:13:34.5454 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pf7RlGzfJwdqVQ7O1KcKfwrGMJKBSfIt0vIMHqSJvRw1RHiR91/xRjHu/GLVT7POCSyMu0+reW+aKkOIVERc8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P189MB3003 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Jun 2026 06:13:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/4205 Use Buildbot StringDownload for repo metadata JSON instead of shell printf. This transfers scheduler-supplied repo values as file content without shell interpretation. AI-Generated: Claude Opus 4.6 Signed-off-by: Anders Heimer --- steps/writebbsetupjson.py | 19 +++++++------------ steps/writelayerinfo.py | 19 +++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/steps/writebbsetupjson.py b/steps/writebbsetupjson.py index da8d434..e1f1463 100644 --- a/steps/writebbsetupjson.py +++ b/steps/writebbsetupjson.py @@ -5,9 +5,8 @@ # from twisted.internet import defer -from buildbot.process import buildstep +from buildbot.plugins import steps import json -import os from yoctoabb import config @@ -15,11 +14,11 @@ mappings = { "oecore" : "openembedded-core", } -class WriteBBSetupJson(buildstep.ShellMixin, buildstep.BuildStep): +class WriteBBSetupJson(steps.StringDownload): name = "WriteBBSetupJson" def __init__(self, **kwargs): - buildstep.BuildStep.__init__(self, **kwargs) + super().__init__(s="", workerdest="bbsetup-overrides.json", **kwargs) def generateSetupJson(self): setupdata = {} @@ -66,14 +65,10 @@ class WriteBBSetupJson(buildstep.ShellMixin, buildstep.BuildStep): @defer.inlineCallbacks def run(self): - repojson = self.generateSetupJson() - layerinfo = os.path.join(self.getProperty("builddir"), - "bbsetup-overrides.json") - writerepos = "printf '%s' > %s" % (repojson, layerinfo) - cmd = yield self.makeRemoteShellCommand( - command=writerepos) - yield self.runCommand(cmd) - return cmd.results() + self.s = self.generateSetupJson() + self.workdir = self.getProperty("builddir") + result = yield super().run() + return result @defer.inlineCallbacks diff --git a/steps/writelayerinfo.py b/steps/writelayerinfo.py index a0669bd..009e9fc 100644 --- a/steps/writelayerinfo.py +++ b/steps/writelayerinfo.py @@ -3,18 +3,17 @@ # from twisted.internet import defer -from buildbot.process import buildstep +from buildbot.plugins import steps import json -import os from yoctoabb import config -class WriteLayerInfo(buildstep.ShellMixin, buildstep.BuildStep): +class WriteLayerInfo(steps.StringDownload): name = "WriteLayerInfo" def __init__(self, **kwargs): - buildstep.BuildStep.__init__(self, **kwargs) + super().__init__(s="", workerdest="layerinfo.json", **kwargs) def generateLayerInfo(self): layerinfo = {} @@ -34,14 +33,10 @@ class WriteLayerInfo(buildstep.ShellMixin, buildstep.BuildStep): @defer.inlineCallbacks def run(self): - repojson = self.generateLayerInfo() - layerinfo = os.path.join(self.getProperty("builddir"), - "layerinfo.json") - writerepos = "printf '%s' > %s" % (repojson, layerinfo) - cmd = yield self.makeRemoteShellCommand( - command=writerepos) - yield self.runCommand(cmd) - return cmd.results() + self.s = self.generateLayerInfo() + self.workdir = self.getProperty("builddir") + result = yield super().run() + return result @defer.inlineCallbacks From patchwork Thu Jun 11 06:13:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Heimer X-Patchwork-Id: 89736 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE1CBCD98CF for ; Thu, 11 Jun 2026 06:13:48 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.16]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.39387.1781158419335035151 for ; Wed, 10 Jun 2026 23:13:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=BYIhxMRl; spf=pass (domain: est.tech, ip: 40.107.130.16, mailfrom: anders.heimer@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cdqn2SUAXNUTsvt0i50JTgh6PUugIXLvi9f4X5JRZU8lgThn4cKnca+vxrLYD9jLT84TUOFSvca7enOszcahZy5+FD2mFzP0NgS/agJQ2JANom3+2N14amtx67mgHbBtzATIS3iAXQJlehxFHggKFSthTMaErKYQx+F6votEDHYjsw5PhhZ0aSX+p4s+dZFsId3/e7eiO3ojo19F8750T0zjpb1fxALq3YxX10ZR7evdikQe6D+17roMrjCsjaySvtAN0OSuJJ42ZnV2SHz2ez+l9xW7GD+EfESoILjuWMojgPKvVKrN35lCiJXL3ABGWSD1I7OKwF2tA5qgs3NHCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fhOv9TnWIg0C0BtGg11uWQ21+0c3cDYMXZBHl8ENEoc=; b=wE91bPkIObw/hLzjssrxq0Qs60EmnhoC4LiH5uxw5iIDp0oKsS7IEaJysDv1NRRQSX3P+hI5TR7d721SqHpEycWJ//rFyIhRTwNBaQGxtyLeASOE1nlud7wnil3o1M3kL16EmFK02971erDL8tqXeY+w9MikG7lZJbrkFnrtvbLX1fvyKqHFRVD7I+JmjNgAUaafY4ucNl8aoitDHqgnA4cF9JtV6mIS8LtKJaPWb6+Elr0ZRl652h47zjnn0kq1WoF8xO7cFWbf4OvLBY5y1T/cXP2wQDqVrN2ZmjeLMdD6/BIsigymf6CBw4AIimJRy20q3BaoZqkdYOjk0t2SmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhOv9TnWIg0C0BtGg11uWQ21+0c3cDYMXZBHl8ENEoc=; b=BYIhxMRlYI8zlabBFQVKJNtK8CwMoNGXZ0gHFMPGDBJte7/rhXLROHqXbTreGhNdxv+ZG//852TfRWFa42RKDGtOspncp6Rlt86/tYdEOdHdZe/kKSqJGTDEdl7LTwbjP4Ndz+8qAebZqrZ6QhhkAJEp4B3BcNMPMJnRpUgiMMYY8JJp0z2dLisPTl4JV+jcMmAdK8OQxEscG29cOBJ84kvB5E9v42Wfu6zQTmjSh7+PkTvLtHcTOFgBlantgtZDg4I2RWRTA/Of//IFFbOg69o2Nkr6q1ol8IAvgj+qo1ghH928gaYJPn/Ghwsquy5hfRnPz2bo5VUF0yXxDuMmyg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) by GV1P189MB3003.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:263::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Thu, 11 Jun 2026 06:13:37 +0000 Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82]) by DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82%6]) with mapi id 15.21.0113.013; Thu, 11 Jun 2026 06:13:37 +0000 From: Anders Heimer To: yocto-patches@lists.yoctoproject.org CC: anders.heimer@est.tech Subject: [PATCH 2/3] builders: pass getproperties command as argv list Date: Thu, 11 Jun 2026 08:13:29 +0200 Message-ID: <20260611061330.733392-3-anders.heimer@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260611061330.733392-1-anders.heimer@est.tech> References: <20260611061330.733392-1-anders.heimer@est.tech> X-ClientProxiedBy: DU2PR04CA0151.eurprd04.prod.outlook.com (2603:10a6:10:2b0::6) To DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P189MB1641:EE_|GV1P189MB3003:EE_ X-MS-Office365-Filtering-Correlation-Id: db9573a4-c0e7-4c17-a795-08dec780933d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|376014|366016|22082099003|18002099003|11063799006|56012099006|3023799007; X-Microsoft-Antispam-Message-Info: qrypek57y7T1kvOjtdjc49hiUvAueQHSTzoLEHfLQQfoYw7vyQs9/AFzhkH+ZwzmJBNiLFVj9TerF9RAL7TEu2NOSA2oG4I5njokC/zO8AurJH46/ec5d1GWTZ2itZSVife9fJkHMKhAmPXYJFv2kEhS+yPilvbcLIhQgJ7qy7buqedPtfwmXz4uXp6bxhCgxv8ZriPRtONUdq1pAsCjGmnat5qKhYmz1wczQ18rx1JkR0ldh9RxQiBscXHpp8W3jlxvjMMA5Manib5uKL9tc6lTMhzZ3JInVUNBrmdK/mDYdO474SRNou+u454ivSuBGVJ+PFDUjGGQNOaZrJILyfgQ6FUWRjR+g/wv5U1bpoaHE0Gnbfwh5wIYkjByFmbYFYOFAr6ARaY3ZBBuO9BWXl6UqnlRO94pLm21RjCkafl91z12qPdty3qXrYmt4KF1ETEcvEBx+m8wRdWcwH8WHZqnDjTxLbvCCdcWR7SHZtNzIEBdECvAgtaGGypEO4TXdPKQctKHVmzoTdNTCRp50kwqiuUi1ebe2L75gHxgO9WRSDvCuLFMK3orSESz5q+EyQ63fNMzt+ZiOJg5TvNIx2IBuR9cpckOsj76Pt4jBVZqFVtiq3eYeP5HYV4dl9f59kSBH0m1XLhCY8emU2S9raNZF0wl0bRp3kIRv9ZOOaDHwRZbpb5lRMTHwMv14ESp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9P189MB1641.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(376014)(366016)(22082099003)(18002099003)(11063799006)(56012099006)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nA/3yB1up4axnb0J8ihEdWE7M7WMDTanq9N7iDhc4POZfx4VeTriT7Zb9DFIhUSKtoJLu+/cWkw5a3Wd+e7d+pb+oGy4IQ16iVNCPopeBvaalLabha4wCO07dtuGzdEVv4HLs8ne1P9ZJXHeCBx/BnXHBigdrJmQIBN0rX0+GtOFZKaZeAez7KgJZ12dEAHyEBFautYmlpObXO5PXZjtLlRfVQAyIVobb92BK8F4zrvKr2VlhP6peTNHWCGqdNiLF6Omm/YWcLReMNO8Ei/zaZumDJgCNB+mBwIqgF0WLlBiySbu607PsvZDOVpIymJ0bl123j+lfREvxF8vPlZ6XMbfcQhlgcwwtpptnZgMgNcfiEr76qeBDO8Qh1HCH+mCKZpjL2rnUpqWe06H+niXhCwyCL6uxACxc5UA8dsz2oBCmW3B2EbPwI+tPwu4j2Zp7v/EdzBULZNoNTUTVwZBBPmJ/XdwPjClrJl5r6GluxiP7vp2nmJvLKl2+OSQJzFXIJ2DmkxkcuS8bViPPApOVVUUY5GFQzS/CmbXu2x4iSRXSpT8IUS7TGQeww6dQSlXwf7RSs9msGfnLMCpHB7bHEN7J9PYiPTV7acCpOpJTCv1FhV9/ZxIfwbdRflIREpNE+nSsuvyd1Oyr2ry3sSE59DiVyIlpLubeHrivugcBtQ+/38kM9aXs+YLRLG05mTikztxNgkL5P2pjvrxg4v9NmpbwfuAXFWrOrI5mvEaWDwHZEt+6LGXeuO8yY4xekZ9A6vW4Qv1qBR1e6uiEFkqh3+LP8cFQg69VDk3VgfIc9kws5vhhwZ6ffzoYeda/dl8JmgBw0RBIfvTVY9lr9BdtqeKpNILX0EhLdvI2/RUCGwJThZpiDS86+ElpAD0Fi3DX9vDHtjeH60V9QW41JCLzHoedglj0rAj6tLQ60BAtB3lUmWjHIcWUYZJ0ZEhVXKsyoRL9ks4IupCjNhCeeJFx7Gw7NA1SvVpgHi1JBzFhGnXdMmcxpGzETnEtmyz+UqL3SS7fo79oH599n32WDSNL/pE4PUdbsk+cpf8Lu7MssOiN0Ox8Eq3+jlQN+i26CZZxDTzVuPRNz9ArMVeeYiVVuKXgk8aR1Af4zmyugNvVEZONyaTee46bqQ23188uPEY+1zWAI76kvKVXwJb8hwO1D0u/exI1tiyEH7Vv4GodGzsf3fuUHDFEG2B+Z1hO5tMIKZml40G/cXHEaU84fqHsCdKm0jtbZ39t3g343Vg+knZMCPGStagFsC4v1DMn/cPbvqgfFfUOKZ6oHBmGxipRU+TrlmSjtWh6s04uQaKsGn5m/GdAMOnpfDlHXNklztxrbBB5aaAunTDa36U4LXgfzJP5J49h0R5DWrtosWj0HSuTto6+ZylZPRcsIvYeu+zn29hFSllJN27TyhEzSrWz1xUqA7/Sybsup+By3ouFm5teIW76HnFGGdDzPl4CwKL9+SMddpD9cNzQoEpdUq7SlNDyylTE3vFCyJb6Lf0BmqXSl+o32MBqfyCuLgG6n69qdsyaS2FwY+8RHZaL+AZ+zAmCA+x307K3Jez5+6tOikKFv8RfLD22XLtDqfA8uOdH9OLdkjTkGLQBxm8amntub7FRX2T4LIrLb7qDUqjEXjytVrQEYcqzATGOW6eIRVi68N3SML8UIwyEL7SlTqqNexQ+4TfTcTJKp12erjgWvgbWGEkG/0EjbmWx/3m6JIfHdOhdNhQ691JrTc7XVEYTA== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: db9573a4-c0e7-4c17-a795-08dec780933d X-MS-Exchange-CrossTenant-AuthSource: DB9P189MB1641.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2026 06:13:37.3993 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: D8XPTbmAOgsdY0tJlZ7auh1rZufDi7rKMilKkqhdknaOirPLnhGSJFCPooZ5u9BYFl2AovU/St160DrI9a1gFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P189MB3003 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Jun 2026 06:13:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/4207 String commands are processed by the worker shell, which is fragile for quoting and unnecessary when the command and arguments are already known. Pass getproperties.py as an argv list so builddir and buildername values are delivered as arguments without shell interpretation. AI-Generated: Claude Opus 4.6 Signed-off-by: Anders Heimer --- builders.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/builders.py b/builders.py index 55f0769..418ef1b 100644 --- a/builders.py +++ b/builders.py @@ -141,7 +141,11 @@ def create_builder_factory(): f.addStep(steps.JSONPropertiesDownload(workerdest="build-properties.json")) f.addStep(steps.SetPropertyFromCommand( - command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"), + command=[ + util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py"), + util.Interpolate("%(prop:builddir)s/build"), + util.Property("buildername"), + ], extract_fn=extract_json_props, name='Load build revisions', haltOnFailure=True)) @@ -364,7 +368,11 @@ def create_parent_builder_factory(buildername, waitname): factory.addStep(steps.JSONPropertiesDownload(workerdest="build-properties.json")) factory.addStep(steps.SetPropertyFromCommand( - command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"), + command=[ + util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py"), + util.Interpolate("%(prop:builddir)s/build"), + util.Property("buildername"), + ], extract_fn=extract_json_props, name='Load build revisions', haltOnFailure=True)) From patchwork Thu Jun 11 06:13:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Heimer X-Patchwork-Id: 89735 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08EA9CD98D2 for ; Thu, 11 Jun 2026 06:13:49 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.16]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.39387.1781158419335035151 for ; Wed, 10 Jun 2026 23:13:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=SiojFLQE; spf=pass (domain: est.tech, ip: 40.107.130.16, mailfrom: anders.heimer@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DKTKXJKXC1U/Lmczo3ztDXUposaork0k2nCwq2THZQPh4OZfEZRo8138cLUf55tMt1YRUbwJbNGu5Tr5PtQWCURsikvMuaXnKsRFdAL6zQnHL360vrDg+Fn/ACDo3zu0MbhFM0M0+TH0PE2dnl648ib4OtiWNLXGEVv+hRsgwC27hjAsEqeOnKhPISkzpOspT/K+14H3X34iDgkXHJOnwz2Kgxz6NvmEWEQDfzDmdpKhX4/vhaEh6C+eFDw7yDp55nB7ttdEAYy1dPcmJjzUYvI6dhvS4vwH8nP6cOh0EfMoGQQzYT2c3ZHebF4m+lul4EOk3yHNJkjNaIttu2ji4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MJMsjrBdYAa+Czwf1FeYqJTQxMAfFcjo/Lk/eT+vRHk=; b=ChK8DdMuXw7+f70ScGeVgp3ZwqOJccsJmxhLL7skr/SEah96kOuM613KB/XueB+hq0RBAQkxwH0QgHcPDBSp/97Ofe5Qp/1r5PA39SsWcCWGXFGt0UNw4BRlugh3sJWkV1kKmQhH4NjSomMedv6Q4hnELSd8hiyGNC88/MpKPFt/HEH0rq2Pht3CbkncWiyI6WWgTvKWVbs0EWh2i0uUj2SzGvpzXeUBi/xzck2kmD6x+uzz4P3GAZC0VGzcNKugbnM1QmfRWizdViLRBoqWhyC82T+x6yRTfb4hkknFU1QYAjqe5zP2iMiR31uuu2e8YbDX27Ho7dp04ZRUZsfdpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MJMsjrBdYAa+Czwf1FeYqJTQxMAfFcjo/Lk/eT+vRHk=; b=SiojFLQEXeiiwn7bYcl9+M01uG4xjk8DY8QJWJRRl2YpzFSi8RF/kE61Hi0+9D4nKSqPkZ03kg6WCaLtmFC9MFPGXpkEyLiZaswCRIBNrXm8KZ9zL8EHxZKekWSGJ7/pxjxjybB4Y9a5iQzwAOew5wlzCMlTUWIM7RGNSVnRqtN3LZGqDQn6KTnPr05CL4NdHeVdfb7MYRsphoFNU/fAVQyRpdI9IzncuCbqraMoAH5QeaCQEELQuBT/DXyRBaH9rYyOX+gt+pcN56u4+Bf7aGBN6XbyJKgsaHHVvdKUPUm5kpPfugdZAqkQhJ2V0YeP250lV86GhElYqE7Yn0vXww== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) by GV1P189MB3003.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:263::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Thu, 11 Jun 2026 06:13:39 +0000 Received: from DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82]) by DB9P189MB1641.EURP189.PROD.OUTLOOK.COM ([fe80::90da:b700:f102:5c82%6]) with mapi id 15.21.0113.013; Thu, 11 Jun 2026 06:13:39 +0000 From: Anders Heimer To: yocto-patches@lists.yoctoproject.org CC: anders.heimer@est.tech Subject: [PATCH 3/3] builders: avoid shell pipeline for disk space check Date: Thu, 11 Jun 2026 08:13:30 +0200 Message-ID: <20260611061330.733392-4-anders.heimer@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260611061330.733392-1-anders.heimer@est.tech> References: <20260611061330.733392-1-anders.heimer@est.tech> X-ClientProxiedBy: DU7P189CA0010.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:552::12) To DB9P189MB1641.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2ac::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P189MB1641:EE_|GV1P189MB3003:EE_ X-MS-Office365-Filtering-Correlation-Id: a30d2d49-e983-4238-4057-08dec7809480 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|376014|366016|6133799003|22082099003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: GhBfGnjQaMFXCmozr3FVELiRbC14OK/v8MkN0vno5kEBwCoG1XzJvr3jUeekgN4HhHqryalp1gwQhlxQiZEZMrFCzRHBr+we/GTqaEZuAqthlJak8njFN53B8WZcmpuH4o1wzItxL0zlzDPw5xokR9/32csMH1Sy0alrkf7q3AGcRYFBQGwq2bL/ENmi3wDbL+mUqaRFUT5wbhHyu06xXZwYwyvKIhQVPoJXS9BnUPdp60g7q9/IW8s1SY5gGxpkTqirJg7buwILkkbJOfLtqh0FBiOydTMg6uAGwzdlYLoGiQOCNnFHVPHflE8g3MpfJdVzuxJ3GZR/Qp+MD/6GtSTB38Avqf4Kw7V/dV8fyunJGglLcHE7EycRAgzg74lV7ysCpYPp+fvwJ+FkzIg5PCT8HogMQoSwFfQlTVgso7q5NioISOhd6yQ3Os8lkrElRVH547mgF1wfpYowJhAGmo8PUZ3RWvKPIHzvp6L1U3ukI0u2FV4sBZ87rebHS0ZTaxU+hmbRsBkdvLgEdL3r/WelYpvUnPV45h/0JN0m+3DMapSky30RZgoZgVrNMFGLYFCws8vTPmJVlQi0LsZnudJtUnrAqaXC8agIq7qDuepcOMF/X9TeCSSR87UELDUPstGgdc+hTMHp8kJFfPW653gM8hhb+8WcfCoDViXxS1w9KkiW8gLt5DshUAXD6myU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9P189MB1641.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(376014)(366016)(6133799003)(22082099003)(18002099003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5qq+Rwg9kB/ID1WHGjStSxyxNovZMbbQbbfdGg1esRiahwigDcH74703ZnC4HelTHOKq6sdgN+o1Od73TC0HKnuWmIk1f6CNNCFABmEDKdbA7Fg+fBxrp4giJD9dK1b+TMX6p0ZdmwNdIIPCUCc5mGVFvvt+QDzu1LcC2Gwe5fmlT65bGkEjyAcV/7ljKhMzCr5jUUSRRyPFPxQ70DwbRme0R8gAijwRfBAb4oAv237AOYelB+YFcZQwRcin2HS/OgIcniZO+x2zYKwADrIJ/zaITnvji5i3HXQtaygpT3UHMnkhrTHiOnRkfKhlrryzbx4nl1WpZhpPUer793ARchiz1kJzVOPFeoAxgSzR6Ah5SGzpTjyVmkeU8jEDECQntXMRWPpjOVB1iDYyiVVGe4+6sZJwI41prIxonl96i1Mp+40oLOkSKmDsAVNGbJsX7vEEQUleUHdOpRQthiYtOLDh9eK5en1uVEj5VgLCdl1zjtrJw2kYwpGM76mkkKsD5iyqcISU21mNuhx6Fcv2Oo8js1JwhHQLZVlHZOvTOKBbFxnFKHR/Zsysaov1gfq0KUu82KQAq3u2CectVUpme8K/PvC6hDgpP7vz2Dcpdmdm/ZojOp/NklmSs4RKaEgi+CzKab392wlkjm3CBUZ11wS8xLgmqnhZhhC3x+EUc3te2ZL2w/a0UsGXysD6ZHFXLkDSq8VhPaufyLBqQg1EEDf8XQJxWxpdpXJ4vf2a47JgWRcEovzOg8fX6JwdGpMYuJMUTxGK64hZxf7DZBWMTUFVlRCMaeqQ75pHg3a6MmxJtHl/ek1BHDSEbfCCJk18htYf4Kb3W/ZjlTnK8vMYPNTqiBXzrY5kjiXMuSwOI0DxxqBNG7H0roayxLdC3XqXUwAvQsK31A01IkNM5s1bUOXZ27Tf64ak/63EokLgo0eV1MwgegRHl2lO9WSucrfcKZ45sZNlNg2brz+0XAA4ul404hotu96AxjEPsRtlK5Ha7UpCM8NLkYR5xKE7R2yDCMddIDy2TQnH+Q7LtaAAn/D5N9zdyKpc5qZVpMtScYQJjtWbAzyIfv3F5tIROrXrNWISznM8VFJD8UJThzfd6pR6AaSpy+uiphIuaGt7PaiP0PFJ0SSfZgBPf8z2z40lelQmyUAafCKHXmNwIzCVhQKhPs5BEjZlIZ0feZ7xr9Ss8MAYqxwyMi1zofDhCPGkyAvzSRyPNh3OrTGp0gszqXbZ/tJr6bPuF1+Z05dH0Sqe5SXa2MWL2gaxOth8wTEL/pyhUeGoUDA0ihykI7gBRDwx/RwLYLUfY/u9cj6yxGv8v/KyO1nFaMM6GmlQMcChfHqGPiWxqRJD6iMMbWdytCa9JJcoAy+T1xOp1gp8QQPty+uvDDgqiqCOOv8kimtGtv9PF5t8wQGxuXciXgFoACsYLp5wBY05CUCvCf5f66PD1SyAbdtIz/Eo0rSU4XOZo12RVpUa8zFW4b5S0Oz+J1pNRiU2Up9NY7d6DwNDPzZteMwkiAr7j7Z0bXK9gwI9HH9+ZvZrgCfKsJpOAETXM/Wijnz0InfPGsSUlSrWO/zey7+pdtvKS8SuZySgKTkb2m3tIZ2HRUXNcU59IdlwQkVEEZBhapy4RTR1sUYXBUynP6j5OcS7bGRghpErtSp/5KiMgDG5RVLkzFdjwfoBcjpRP3OwHS7khkVJBXvWWdwttsB+WoNfMRYmVAH2VBavlUEr9sV1oGZ/V6nZj5rG9w== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: a30d2d49-e983-4238-4057-08dec7809480 X-MS-Exchange-CrossTenant-AuthSource: DB9P189MB1641.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2026 06:13:39.5207 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0oNpCaVD0LSA7xgSrLaOic1Jz7BajRVTTqfcFFnAhBlZHyRPionpT1quLZhgx58QXJ1nPixpnYx5NKig+pFrNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P189MB3003 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Jun 2026 06:13:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/4208 The disk space probe used a shell pipeline to run findmnt and awk. Ask findmnt for the available-byte field directly and pass the command as argv, avoiding shell interpretation. AI-Generated: Claude Opus 4.6 Signed-off-by: Anders Heimer --- builders.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builders.py b/builders.py index 418ef1b..1b65e55 100644 --- a/builders.py +++ b/builders.py @@ -81,7 +81,9 @@ def canStartBuild(builder, wfb, request): bytes_in_gb = 1024 * 1024 * 1024 - cmd = yield shell("findmnt -T %s --df -n --bytes | awk '{print $5}'" % mountpoint, wfb.worker, builder) + cmd = yield shell(["findmnt", "-T", mountpoint, "--df", "-n", "--bytes", + "-o", "AVAIL"], + wfb.worker, builder) space = int(cmd.stdout.strip()) if space < threshold * bytes_in_gb: log.msg("Detected {0} GB of space available on {1}, less than threshold of {2} GB. Can't start build".format(space / bytes_in_gb, name, threshold))