From patchwork Tue Oct 7 14:37:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71778 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 8CC6DCCD18A for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web11.20531.1759847844636431193 for ; Tue, 07 Oct 2025 07:37:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=XpUj+ue/; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 58CE71A1169 for ; Tue, 7 Oct 2025 14:37:23 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 31EB8606C8 for ; Tue, 7 Oct 2025 14:37:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9ACB5102F2156; Tue, 7 Oct 2025 16:37:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847842; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=KDMxH4YMh6rAggWi2TJT8vvzHPSCi++RKT+AOExDTrI=; b=XpUj+ue/+wl06aFLf+5rKAoVZkrdylvxwdB5KxCfb+qixILqUCaumiUWnqPRFVV6bHUS18 ZwAydHjCFDQavQ4O2QsYeT4TCsqLGGG/6TQHiqcJFUtKYiSiI4z1CC108gdPVMo7bDSY7T UZxu6E6jZ8NKAtzeEFabpf6s95x4EslxytHZcjOdfqIGTLlGG2GdKyqxSCigo90H9SklUu mRj8XUxvPSgn7VAttw9VI8OR8CukwU4wTIuKVkCp4ZW5nf2GWp3chVzone6xU5NSmToyKB ZQ0ZLzmlI8tXAwUaCpZ4KUdFvsW4ipAVKbKEU6DsV6fuOgWCHqh2rhTLOQ8luw== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:17 +0200 Subject: [PATCH yocto-autobuilder2 01/10] docker: Update buildbot version MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-1-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=1028; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=QUxIUoMM4uvmLpt9aC7VBLO+SNWhuHizelFlQ4Z7dgY=; b=EuNUnZVBBkCpU5bCIulr6Jh6UrQmacpb1ke7ySol6qLVuJSXVvNrdCJaKwYwLQq7ZDzCrilon Mukwn/CXhZ3AGrKkg3fmRIR8vgJ5x12mjagvYFz5qw5jZVE2zH8184c X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2277 Signed-off-by: Mathieu Dubois-Briand --- docker/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6948a1155548d753778886b0203c78ea0f85ae43..5de05c40853ad5aad478cd8521384249477f153e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,13 +48,13 @@ ENV LC_ALL en_US.UTF-8 RUN npm install -g yarn RUN pip3 install --break-system-packages \ - buildbot==4.2.1 \ - buildbot-www==4.2.1 \ - buildbot-waterfall-view==4.2.1 \ - buildbot-console-view==4.2.1 \ - buildbot-grid-view==4.2.1 \ - buildbot-worker==4.2.1 \ - buildbot_pkg==4.2.1 \ + buildbot==4.3.0 \ + buildbot-www==4.3.0 \ + buildbot-waterfall-view==4.3.0 \ + buildbot-console-view==4.3.0 \ + buildbot-grid-view==4.3.0 \ + buildbot-worker==4.3.0 \ + buildbot_pkg==4.3.0 \ websockets From patchwork Tue Oct 7 14:37:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71782 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 AAB33CCD18D for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web10.20398.1759847845173485306 for ; Tue, 07 Oct 2025 07:37:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=HomEsVvt; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id DED371A116B for ; Tue, 7 Oct 2025 14:37:23 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id B7C39606C8 for ; Tue, 7 Oct 2025 14:37:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1BAF2102F2165; Tue, 7 Oct 2025 16:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847843; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Z3bfdtzEXLmxLUDHuDAVyxJh3MBQFTDRqZQNpaXLI40=; b=HomEsVvtXseKJTKySFTTVQhVJmxxMrPA2h57rQjpcX1MCagh7Gb1p6tFVEkWp2sRGWMgRK gySCqKXfc7s5gUWPwVLVEToL2Sla+hQljthuiljw0oD8KlZB8TVQZPca5Bq4/V0SW2N26M jFApzODMFYakrcPtjSIqE4s8iTHXaNHw3z+UyGTI+XTJ2T/10TRhDg2ACl5Cd1sutSk65H NPfUeODSxVNu2iv3tGeyLlxAFdCBO/Ozz2OTdYq1EgD0qpB4KRIEDfBUCnNhj92Y6GtrXN O82Lvslg+RwSee8tsQkZmQtpT2/6wIkqNufdebayMRXwXbb93c0vt3Z+IQSylQ== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:18 +0200 Subject: [PATCH yocto-autobuilder2 02/10] docker: compose: Fix docker role detection MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-2-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=1941; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=Pnzr8L0tp10zJ9Fd2Wlw8qsVJi8t6vgA5Vyhbaq6G1g=; b=752ND0admrkg4U0JTm+6FB5qcC0ky8A33OJUS5+8tdYjr20DYrQ2KCjPBKzxJ+t9ZEtJe1Hgs 3who+vhAlqhADPFwQcwgDXhEk8S5z6j23S0n2QQ6YXa/2jDZnby+0bn X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2278 It looks like the name of docker containers created with docker-compose is not always the same: is is generated from various values, sometimes separated by underscores, sometimes by dashes, breaking role detection. Try to use another method that should be a bit more reliable. Signed-off-by: Mathieu Dubois-Briand --- docker/compose.yaml | 4 ++++ docker/entry.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/compose.yaml b/docker/compose.yaml index 50034d90d52b34f5d09c01a48b8f3e256fe8339a..334e13720b3b4b89128300fa623628d7ea219b5f 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -2,6 +2,7 @@ --- +name: ab2 x-base-service: &base-service build: context: .. @@ -17,15 +18,18 @@ x-base-service: &base-service services: controller: <<: *base-service + command: controller ports: - 8010:8010 cpus: 4 worker: &base-worker <<: *base-service + command: worker cpus: 8 mem_limit: 16gb extraworker: <<: *base-worker + command: extraworker cpus: 1 mem_limit: 2gb deploy: diff --git a/docker/entry.sh b/docker/entry.sh index 1aef2ba4025f9871e84189283fd791fab109862d..900e4b9b229ffab31fcd345b8eaec57bd2fef90a 100644 --- a/docker/entry.sh +++ b/docker/entry.sh @@ -6,9 +6,9 @@ chown pokybuild:nogroup /home/pokybuild/git/mirror chown pokybuild:nogroup /srv/autobuilder cd /home/pokybuild/ || exit 1 +role=${1} docker_name=$(host "$(host "$(hostname)" | awk '{print $NF}')" | awk '{print $NF}' | awk -F . '{print $1}') -role=$(echo "${docker_name}" | cut -d_ -f 2) -instance=$(echo "${docker_name}" | cut -d_ -f 3) +instance=$(echo "${docker_name}" | sed -e 's/.*[^0-9]\([0-9]*\)$/\1/') if [ "${role}" = "controller" ]; then su pokybuild -c "yocto-autobuilder-helper/janitor/ab-janitor" & From patchwork Tue Oct 7 14:37:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71776 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 6CCF1CCD185 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web10.20400.1759847846021726345 for ; Tue, 07 Oct 2025 07:37:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=AKDLOETr; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id B6F9D1A1167 for ; Tue, 7 Oct 2025 14:37:24 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8FC5B606C8 for ; Tue, 7 Oct 2025 14:37:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A5EDE102F2166; Tue, 7 Oct 2025 16:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847844; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=7BoPqoyea16+BP6K3is30rOD1ciSF2uXtzm3xC7FQ/g=; b=AKDLOETrFoNUjyViBLeTqnHStOpIRoGaUnFmlEyVQ9WyYvedrOtKCLXCF+0ocqI8UjtHOs Jug9wIxFKsK/iPeOb5veXA1YQmK7hdHjNt8CN39H/bbhPK7FQxB4MOqCL8Oky5qLScVcdB 8VcoDLIJcoY3rBduIpjOoAfE0YBPyQ/SV5sHiBb+59oEpuE0qCfqmGDtWbbZ2PPeLGSWmd 2DpubB0mIsmZUjOO7FNsvQf1OM8JQ9u36hs/vLAxtSUOFzFZkptD6jw238CUKDiM8wKz7X F7/PXImfmSM5h20JKiHw93PgsCX6Eewq5GDZMsDGvq1RSvDEXdgcQaItKm2PVQ== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:19 +0200 Subject: [PATCH yocto-autobuilder2 03/10] docker: Fix missing directory MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-3-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=846; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=XYmdOYvI1zcJHTmYbQPjtxSaGfeU/l14d16SjTvUAiw=; b=yshFTTCVw5rJDk2cbj6mGrA3ndabTey3OaSoPGnpBfbnFYOYqoFImcG1dM0E866wLRj+RemIo HVQ6V8r2vTQAY6WcbKNy2vfbvEKucAmPHPsIx2nYUNbQuyyXo2hFMgM X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2279 Signed-off-by: Mathieu Dubois-Briand --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5de05c40853ad5aad478cd8521384249477f153e..b1df8602252080c6bceeb5da24db209a6a70a407 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -89,7 +89,7 @@ RUN useradd -m --system pokybuild && \ git clone https://git.yoctoproject.org/git/yocto-autobuilder-helper && \ pip install --break-system-packages \ yocto-controller/yoctoabb/yocto_console_view/ && \ - mkdir -p /home/pokybuild/git/ && \ + mkdir -p /home/pokybuild/git/trash && \ mkdir -p /home/pokybuild/tmp/ && \ echo "[user]\nname=pokybuild\nemail=pokybuild@none\n" > \ /home/pokybuild/.gitconfig && \ From patchwork Tue Oct 7 14:37:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71777 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 7CE08CCD186 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web11.20533.1759847846578797570 for ; Tue, 07 Oct 2025 07:37:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=NFLWbPNh; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 46C461A1169 for ; Tue, 7 Oct 2025 14:37:25 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1F7F5606C8 for ; Tue, 7 Oct 2025 14:37:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 788D8102F2169; Tue, 7 Oct 2025 16:37:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847844; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ChijKfl4a/KlZzXtzCf9MLEiMPZdMHNqLsRPV9pPQ84=; b=NFLWbPNh1Xt64WVNMrTwpjRmubRIavIjI/uaWQbu9Onctqrwv3GUsZMqKIsXUmrcam6Jfp RzbRWsoR+SxRvM8jbwRqAgrkUEvVmuRANuZ0C3DyjGfvF3sPZQwg6QPSeB8YF38iXn8e2/ 0KkrqaTL++5BDcPW8/Bhogu5v1qumFFQoQYdaqNmIXZeULi3dkd2PNHcj99Ui2KtLRYqNj lbwOy66Joh7ijWutvR52CP9EOHbCK/bRjQnqpi6Sv1MWdB6vQiZcK/XQc72FxHdRbS1wCb +Us69lkNwIerv3N58M5gnhuZwSCH04TBO+qhGIDTPs42kR1RTrRETLRyHp1flA== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:20 +0200 Subject: [PATCH yocto-autobuilder2 04/10] builders: Fix disk space error message MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-4-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=1257; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=tvfiFRdxtQU/aBxcgIBY+HsfXbh3yQhb4wr6oevBKFo=; b=p5wRPPgYADBk/fEA/o9jC/BXqn+0GU7sg8IOVHOUsQ+XR/KrGHdl4jYqnLBod1ayvTvZKoJPh aCtz/ACWXIeAewEqMJOgbihMSA+M3aQD0d479D/AIBq+68vLz7tx1n+ X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2280 Signed-off-by: Mathieu Dubois-Briand --- builders.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builders.py b/builders.py index 0000122af015158e0cbb3a689e2419ab9c03e103..15985f258bb9fa7d38e70f4ca35f87ede4c24a23 100644 --- a/builders.py +++ b/builders.py @@ -77,12 +77,12 @@ def canStartBuild(builder, wfb, request): for mountpoint in checks: threshold, name = checks[mountpoint] - threshold = threshold * 1024 *1024 * 1024 + bytes_in_gb = 1024 * 1024 * 1024 cmd = yield shell("findmnt -T %s --df -n --bytes | awk '{print $5}'" % mountpoint, wfb.worker, builder) space = int(cmd.stdout.strip()) - if space < threshold: - log.msg("Detected {0} GB of space available on {1}, less than threshold of {2} GB. Can't start build".format(space, name, threshold)) + 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)) wfb.worker.quarantine_timeout = 10 * 60 wfb.worker.putInQuarantine() return False From patchwork Tue Oct 7 14:37:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71779 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 80EEBCCD188 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web11.20534.1759847847111038424 for ; Tue, 07 Oct 2025 07:37:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=ovKkcIVe; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id D03921A116B for ; Tue, 7 Oct 2025 14:37:25 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id A90E9606C8 for ; Tue, 7 Oct 2025 14:37:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EE41E102F2168; Tue, 7 Oct 2025 16:37:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847845; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=1n/PfEIy8T/ke7sR7sW2U4r8XL5aCCtkmL7lG7LXAfk=; b=ovKkcIVeLbFzD0y7Z4O32Sv+bpkLd1OzMSgVToLLZCkQFCiVXf3lpSQ6l9Kg1hksS5jEz2 CB2KnCO0UpSi0TRuIwVduSNxi16tsNgrvrdYYq0V8GQj1l3IrMDtYHWwdasu+3wI3zKvHU uC0qYdc0aMQSWnaoMSLr+PvGdkC70VYMioBRon9q5Bh7b9KA5ZlROgRMulVp6Ny5Y79iDU Vi3fUeqdGRdx4fP50/+IsgUwkeoOmYcGXyoGHJOgoHE0Omx2ng77exk1MgmBh6VQCPtIIb NPCLK3+02mbMwgMElc12MYY89sDXDufQMfyOZ+8g0gEus3RAG9EF75UYMnBOgQ== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:21 +0200 Subject: [PATCH yocto-autobuilder2 05/10] docker: refresh patches MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-5-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=4396; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=eoj1cUw/NZtNe7Wmk/bbz6xAp4hPhnH4NK7Lf394HSY=; b=8ZUd9gC6pnzlJK8jXyZN+E/aowQ6ULnr2fKlfSYMTD4Jo6VpGVKZ72fCLOpubYrCSX2fYzyRp nEgeuFsi8WFD1dWGTVEveMP0eYX4XMQIaugAhnHh/iCeNCDFUUbbtyH X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2281 Signed-off-by: Mathieu Dubois-Briand --- ...001-builders-Do-not-create-tags-during-builds.patch | 8 ++++---- ...ers-Modify-free-space-check-to-work-in-docker.patch | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch index 65b428caa1fc086a88f6b1326de25d2b00843582..8e772c8fa7b1b2cdd59af58f5f87b1332d5fb602 100644 --- a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch +++ b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch @@ -1,4 +1,4 @@ -From 12db34cf42ca695bd34594853013e54464a809f5 Mon Sep 17 00:00:00 2001 +From baef5f6c4c2cf973385392d1e163f8bec2f6cca2 Mon Sep 17 00:00:00 2001 From: Mathieu Dubois-Briand Date: Fri, 3 Jan 2025 09:39:06 +0100 Subject: [PATCH 1/2] builders: Do not create tags during builds @@ -9,10 +9,10 @@ Signed-off-by: Mathieu Dubois-Briand 1 file changed, 1 deletion(-) diff --git a/builders.py b/builders.py -index b4c08fa1f29c..4e10bdceedb2 100644 +index 15985f258bb9..a16a857d9211 100644 --- a/builders.py +++ b/builders.py -@@ -284,7 +284,6 @@ def create_parent_builder_factory(buildername, waitname): +@@ -307,7 +307,6 @@ def create_parent_builder_factory(buildername, waitname): util.Interpolate("%(prop:builddir)s/layerinfo.json"), util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), "-p", get_publish_dest, @@ -21,5 +21,5 @@ index b4c08fa1f29c..4e10bdceedb2 100644 haltOnFailure=True, name="Prepare shared repositories")) -- -2.39.5 +2.47.3 diff --git a/docker/yocto-autobuilder2_patches/0002-builders-Modify-free-space-check-to-work-in-docker.patch b/docker/yocto-autobuilder2_patches/0002-builders-Modify-free-space-check-to-work-in-docker.patch index 6d3ec5539b97c0c45b18f73cf7d1fcf93fa39f32..8c0ad1c93cbefe0887c6618a67761c582ce0b99d 100644 --- a/docker/yocto-autobuilder2_patches/0002-builders-Modify-free-space-check-to-work-in-docker.patch +++ b/docker/yocto-autobuilder2_patches/0002-builders-Modify-free-space-check-to-work-in-docker.patch @@ -1,4 +1,4 @@ -From 9bf9680ab9125138d926c22ca434ad86053bb5c4 Mon Sep 17 00:00:00 2001 +From c6032ab33d39981eb9dede27d0bbd073a8d58389 Mon Sep 17 00:00:00 2001 From: Mathieu Dubois-Briand Date: Wed, 20 Nov 2024 14:53:34 +0100 Subject: [PATCH 2/2] builders: Modify free space check to work in docker @@ -9,10 +9,10 @@ Signed-off-by: Mathieu Dubois-Briand 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builders.py b/builders.py -index ba47241de2cc..02f6c10c6add 100644 +index a16a857d9211..d5389283e605 100644 --- a/builders.py +++ b/builders.py -@@ -67,8 +67,7 @@ def canStartBuild(builder, wfb, request): +@@ -70,8 +70,7 @@ def canStartBuild(builder, wfb, request): # threshold is GB of space checks = { @@ -22,15 +22,15 @@ index ba47241de2cc..02f6c10c6add 100644 } for mountpoint in checks: -@@ -76,7 +75,7 @@ def canStartBuild(builder, wfb, request): +@@ -79,7 +78,7 @@ def canStartBuild(builder, wfb, request): - threshold = threshold * 1024 *1024 * 1024 + 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 --all -T %s --df -n --bytes | awk '{print $5}'" % mountpoint, wfb.worker, builder) - if int(cmd.stdout) < threshold: - log.msg("Detected {0} GB of space available on {1}, less than threshold of {2} GB. Can't start build".format(cmd.stdout, name, threshold)) - wfb.worker.quarantine_timeout = 10 * 60 + 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)) -- -2.39.5 +2.47.3 From patchwork Tue Oct 7 14:37:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71780 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 8C7F6CCD187 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web10.20403.1759847848118835825 for ; Tue, 07 Oct 2025 07:37:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=HrHuJ4jx; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id CB4801A1167 for ; Tue, 7 Oct 2025 14:37:26 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id A4434606C8 for ; Tue, 7 Oct 2025 14:37:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 78F1B102F2167; Tue, 7 Oct 2025 16:37:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847845; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=yB+ANRchbSeFwISRo31WdrNP+sShEiEaGE0sLCEor04=; b=HrHuJ4jxd4OLkNvmoyMD96Ji71fJQb1EHBrjDBAf9uv0mWLZCHbkDAF8yDQogW9Ojhc8ol ViBBOTCgcUZlYhZXopClx9dPxfPyyjsStshB11EEelXApgUQ88N2Sh6WPvky9Le+XxGGlH qIKqXsLnwRXK29fEuFXP/IGxczusZrIP0iwU8ZfuLkRTA/cqnNT/GH5QU1HSOifjrXfPQy IE+rCx9Dv4O7Q4yhORLNEAzcVDwPNKUPTo0RT9pvg1mhx1bmButpQPWxHpRsm85LvyCJyT lNa67h+w/XGAANv5Vpj8Wh308UQh/jR9wnNJsrNetND7C9XWOX0/TznpgEZHuw== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:22 +0200 Subject: [PATCH yocto-autobuilder2 06/10] yocto_console_view: fix commit links MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-6-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=6753; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=eecZ2wnAAo4+keyYCyd4x561tHopeQnxPBwj4EEBKOc=; b=2Os+UDbQ8duoAlcCnvMWtu6/O0X1mke/JTzJRovb/ipkqjA/XZ20uD/HZip0t0dTc5WGKkDrC vIue/l7ATGyD6nU9appVp/cABIoReo6Y8+fn89fa7qwurEgUSMZv88x X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2282 Signed-off-by: Mathieu Dubois-Briand --- .../src/views/ConsoleView/ConsoleView.tsx | 37 +++++++++++++++--- .../src/views/ConsoleView/YoctoChangeDetails.tsx | 44 +++++++++++++++++----- 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx index 826ba2aec8bdc775e7365c987284a82628c0db1a..dd84c7913cdab3ae3e4537e4b00d0fb077be4b71 100644 --- a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx +++ b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx @@ -125,7 +125,7 @@ function resolveFakeChange(revision: string, whenTimestamp: number, comment: str } const newChange = { - change: new Change(undefined as unknown as IDataAccessor, "a/1", { + change: new Change(undefined as unknown as IDataAccessor, { changeid: revision, author: "", branch: "", @@ -135,8 +135,12 @@ function resolveFakeChange(revision: string, whenTimestamp: number, comment: str project: "", properties: {}, repository: "", - revision: revision, - revlink: null, + poky_revision: revision, + oecore_revision: null, + bitbake_revision: null, + poky_revlink: null, + oecore_revlink: null, + bitbake_revlink: null, when_timestamp: whenTimestamp, }), buildsByBuilderId: new Map @@ -156,8 +160,19 @@ function selectChangeForBuild(build: Build, buildset: Buildset, if ((build.properties !== null && ('yp_build_revision' in build.properties)) || (build.buildid in revMapping)) { let revision; let change = undefined; + let oecore_revision = undefined, bitbake_revision = undefined; + let use_bitbake_setup = false; if (build.properties !== null && ('yp_build_revision' in build.properties)) { revision = build.properties['yp_build_revision'][0]; + if ('commit_oecore' in build.properties) { + oecore_revision = build.properties['commit_oecore'][0]; + } + if ('commit_oecore' in build.properties) { + bitbake_revision = build.properties['commit_bitbake'][0]; + } + if ('use_bitbake_setup' in build.properties) { + use_bitbake_setup = build.properties['use_bitbake_setup'][0]; + } } else { revision = revMapping[build.buildid]; } @@ -178,7 +193,19 @@ function selectChangeForBuild(build: Build, buildset: Buildset, if (build.buildid in branchMapping) { change.change.caption = branchMapping[build.buildid]; } - change.change.revlink = "http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=" + revision; + + if (!use_bitbake_setup) { + change.change.poky_revlink = "http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=" + revision; + change.change.poky_revision = revision; + } else { + // We might retrieve the "use_bitbake_setup" after the first execution, so wrong poky data might have been added: remove them. + change.change.poky_revlink = change.change.poky_revision = undefined; + + change.change.oecore_revlink = "https://git.openembedded.org/openembedded-core/commit/?id=" + oecore_revision; + change.change.bitbake_revlink = "https://git.openembedded.org/bitbake/commit/?id=" + bitbake_revision; + change.change.oecore_revision = oecore_revision; + change.change.bitbake_revision = bitbake_revision; + } change.change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + revision + "&type=commit&limit=150"; let bid = build.buildid; @@ -239,7 +266,7 @@ export const ConsoleView = observer(() => { const buildsQuery = useDataApiQuery(() => Build.getAll(accessor, {query: { limit: buildFetchLimit, order: '-started_at', - property: ["yp_build_revision", "yp_build_branch", "reason", "publish_destination"], + property: ["yp_build_revision", "yp_build_branch", "commit_oecore", "commit_bitbake", "reason", "publish_destination", "use_bitbake_setup"], }})); const windowSize = useWindowSize() diff --git a/yocto_console_view/src/views/ConsoleView/YoctoChangeDetails.tsx b/yocto_console_view/src/views/ConsoleView/YoctoChangeDetails.tsx index 37670de255c96efb7135c9eb2ef8f4847a627222..18a74cf170034b4eda6a30b0bd3f484fa686e7a9 100644 --- a/yocto_console_view/src/views/ConsoleView/YoctoChangeDetails.tsx +++ b/yocto_console_view/src/views/ConsoleView/YoctoChangeDetails.tsx @@ -70,16 +70,33 @@ export const YoctoChangeDetails = observer(({change, compact, showDetails, setSh : <> } - - Revision + { change.poky_revlink + ? + poky revision - { - change.revlink - ? {change.revision} - : <> - } + {change.poky_revision} + + + : <> + } + { change.oecore_revlink + ? + openembedded-core revision + + {change.oecore_revision} + : <> + } + { change.bitbake_revlink + ? + bitbake revision + + {change.bitbake_revision} + + + : <> + }
Comment
@@ -117,9 +134,16 @@ export const YoctoChangeDetails = observer(({change, compact, showDetails, setSh overlay={popoverWithText("comments-" + change.id, change.caption)}> { - change.revlink - ? {change.caption} - : {change.caption} + change.poky_revlink + ? {change.caption} (poky) + : change.oecore_revlink + ? {change.caption} (oe-core) + : {change.caption} + } + { + change.bitbake_revlink + ? {change.caption} (bitbake) + : <> } { change.errorlink From patchwork Tue Oct 7 14:37:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71783 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 9CC68CCD18B for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web11.20535.1759847848675975747 for ; Tue, 07 Oct 2025 07:37:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=Qer7vVhb; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 657751A1169 for ; Tue, 7 Oct 2025 14:37:27 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3D969606C8 for ; Tue, 7 Oct 2025 14:37:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 83820102F216B; Tue, 7 Oct 2025 16:37:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847846; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ngzc4cRpkiV9RSNmy5vim5w5ZrsMe5hgHqnfNFqwf7I=; b=Qer7vVhb/hrqDvNeW0V/t1aRjz7gQJlBhP7WyQ6nawFbTNUlcb+XLLdm3ahs1N/yd+6ZlB LjGNisvVJebj/3Qw/xvZ+D/dXMsZpxNJmeRAZrYcO95XU4hKMPVAouS6RlOlgkYwWW38u5 AzIoCrbEiTx6wU7oeSu9ZRNE50smKGG9Cd0ZntlpAv1zVIVmZs250qWGazRso40VfFLhHI nt44Dh43kNk3414gBZzKxRIxJnotd9mdKYwHbvIgXwX3+gItNCAH9lT+hXtV1ZjjU87DZ1 tED6SonGiRFNqISpnPqUIAP/i97KWT0OF0yQl0auEI7V3dNeuxMy5cnpyfIVhw== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:23 +0200 Subject: [PATCH yocto-autobuilder2 07/10] yocto_console_view: fix error link MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-7-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=2021; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=OOUSMFHiGOKuzdmHtqWnA6Me8OfsI9afGGkh8+HZaNs=; b=YIrSWdImXXODBg76Qn1JV5TTXWKswLH1Cc3QKRcDd48Khe6AIk2gMZQtbZGsbo7OU5g/yBc4E 42pCLgVPvkUBFwC6WUItFQ9CwAFU3qC6KdWfcvyioL0Q2bOPlo4dwXl X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2283 This might need to be updated once https://errors.yoctoproject.org is fixed for the bitbake-setup switch. Signed-off-by: Mathieu Dubois-Briand --- yocto_console_view/src/views/ConsoleView/ConsoleView.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx index dd84c7913cdab3ae3e4537e4b00d0fb077be4b71..19b24d1a04270f71bda9ea8b55b62196be79f7b7 100644 --- a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx +++ b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx @@ -197,6 +197,7 @@ function selectChangeForBuild(build: Build, buildset: Buildset, if (!use_bitbake_setup) { change.change.poky_revlink = "http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=" + revision; change.change.poky_revision = revision; + change.change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + revision + "&type=commit&limit=150"; } else { // We might retrieve the "use_bitbake_setup" after the first execution, so wrong poky data might have been added: remove them. change.change.poky_revlink = change.change.poky_revision = undefined; @@ -205,8 +206,8 @@ function selectChangeForBuild(build: Build, buildset: Buildset, change.change.bitbake_revlink = "https://git.openembedded.org/bitbake/commit/?id=" + bitbake_revision; change.change.oecore_revision = oecore_revision; change.change.bitbake_revision = bitbake_revision; + change.change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + oecore_revision + "&type=commit&limit=150"; } - change.change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + revision + "&type=commit&limit=150"; let bid = build.buildid; if ((buildset !== null) && (buildset.parent_buildid != null)) { From patchwork Tue Oct 7 14:37:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71784 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 A5F9CCCD189 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web10.20406.1759847849545423740 for ; Tue, 07 Oct 2025 07:37:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=1C398tw/; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 42C061A116B for ; Tue, 7 Oct 2025 14:37:28 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1A82F606C8 for ; Tue, 7 Oct 2025 14:37:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1C023102F216A; Tue, 7 Oct 2025 16:37:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847847; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=0jWrnr0KOK0VFgVvCdN2dwOhZTgtdgSJIMmfy9aSRUY=; b=1C398tw/J2VCDXodH7Txw0KAd16YSVk/pEjBab3qaKzB9Y6I3qvMqvHmPBpprRQjsOtyyk Js+XbnYg/yB4OikufPvTNyuZUcbnCQvQ3G96e9FTiiYGdTUlxRU2nUiJRM7FySZNNRL6xG /2iJ6V7B0C6IvM0Bpzruz0jhQI0JB9CLKQBlaQs/SufsDNfM5CDWeCQYKwK1HiWzyVTBwL KX5cMMrH0M1tyo8nvx3M7LTolCbNxfzZSkZcvGjUyr5Y3VGnh5yDTJFShP8jt/tPnLuEgb zRxdxlo6PcYOf3kuztQaGBPCDvcluA9a4OF7glxtEiQu7PNOz+2JknScNGoXFQ== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:24 +0200 Subject: [PATCH yocto-autobuilder2 08/10] builders: Add poky-ci-archive tag in build properties MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-8-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=4604; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=3J9Uaocr2o+e/7ipiXsMFhBoMD7u3mlc16k8N6BYgFI=; b=UZzJZKtlhTLdol9YcvMSsS2/Vo7OuCECmoUJzM2I90530Fe8rpoer0wEsvxnUaz6Z4uX8aqit ngdYCE6UaHZAxH53+vKSLEKXRa/PB2t3gGRFdu7M0aAkkZkt24arTZd X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2284 Signed-off-by: Mathieu Dubois-Briand --- builders.py | 10 +++++++- ...builders-Do-not-create-tags-during-builds.patch | 28 ++++++++++++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/builders.py b/builders.py index 15985f258bb9fa7d38e70f4ca35f87ede4c24a23..2fb0bf827b0f08fb822320ad9fc858592e606cc7 100644 --- a/builders.py +++ b/builders.py @@ -311,6 +311,12 @@ def create_parent_builder_factory(buildername, waitname): ], haltOnFailure=True, name="Prepare shared repositories")) + factory.addStep(steps.SetProperty( + property="poky-ci-archive_tag", value=createBuildTag)) + tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s', + tag=createBuildTag) + factory.addStep(steps.SetProperty( + property="poky-ci-archive_url", value=tagurl)) factory.addStep(steps.SetProperty( property="sharedrepolocation", value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)) @@ -358,7 +364,9 @@ def create_parent_builder_factory(buildername, waitname): "milestone_number": util.Property("milestone_number"), "rc_number": util.Property("rc_number"), "yp_build_revision": util.Property("yp_build_revision"), - "yp_build_branch": util.Property("yp_build_branch") + "yp_build_branch": util.Property("yp_build_branch"), + "poky-ci-archive_tag": util.Property("poky-ci-archive_tag"), + "poky-ci-archive_url": util.Property("poky-ci-archive_url") } for repo in config.buildertorepos[buildername]: diff --git a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch index 8e772c8fa7b1b2cdd59af58f5f87b1332d5fb602..b36f2ea7e83edcd70ecbab6ecd13f2bb986e2dc6 100644 --- a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch +++ b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch @@ -1,18 +1,18 @@ -From baef5f6c4c2cf973385392d1e163f8bec2f6cca2 Mon Sep 17 00:00:00 2001 +From b6a31b0c63a7529961ea02c53f43b9edb110f4de Mon Sep 17 00:00:00 2001 From: Mathieu Dubois-Briand Date: Fri, 3 Jan 2025 09:39:06 +0100 Subject: [PATCH 1/2] builders: Do not create tags during builds Signed-off-by: Mathieu Dubois-Briand --- - builders.py | 1 - - 1 file changed, 1 deletion(-) + builders.py | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/builders.py b/builders.py -index 15985f258bb9..a16a857d9211 100644 +index 2fb0bf827b0f..af1cc263fd2e 100644 --- a/builders.py +++ b/builders.py -@@ -307,7 +307,6 @@ def create_parent_builder_factory(buildername, waitname): +@@ -307,16 +307,9 @@ def create_parent_builder_factory(buildername, waitname): util.Interpolate("%(prop:builddir)s/layerinfo.json"), util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), "-p", get_publish_dest, @@ -20,6 +20,24 @@ index 15985f258bb9..a16a857d9211 100644 ], haltOnFailure=True, name="Prepare shared repositories")) +- factory.addStep(steps.SetProperty( +- property="poky-ci-archive_tag", value=createBuildTag)) +- tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s', +- tag=createBuildTag) +- factory.addStep(steps.SetProperty( +- property="poky-ci-archive_url", value=tagurl)) + factory.addStep(steps.SetProperty( + property="sharedrepolocation", + value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)) +@@ -365,8 +358,6 @@ def create_parent_builder_factory(buildername, waitname): + "rc_number": util.Property("rc_number"), + "yp_build_revision": util.Property("yp_build_revision"), + "yp_build_branch": util.Property("yp_build_branch"), +- "poky-ci-archive_tag": util.Property("poky-ci-archive_tag"), +- "poky-ci-archive_url": util.Property("poky-ci-archive_url") + } + + for repo in config.buildertorepos[buildername]: -- 2.47.3 From patchwork Tue Oct 7 14:37:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71781 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 9D1D8CCD18C for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web10.20407.1759847850044746447 for ; Tue, 07 Oct 2025 07:37:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=dEI3Rrer; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id BC6AC1A1167 for ; Tue, 7 Oct 2025 14:37:28 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 947B7606C8 for ; Tue, 7 Oct 2025 14:37:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F011B102F216E; Tue, 7 Oct 2025 16:37:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847848; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=7FTHC1WqOutoZr31C01ER1b3g5TUAy9zFh1kH/x7L7Q=; b=dEI3Rrerp5bLrRXz+FxpADxoSy3GE//JRCmPJwv2aLGHsrrcJ2He0S7HXfpZFR8GYOdhNY eF7AZLIPkgfz23EipuLwvQUMs2bNSUAUwYt9HHJ0Q0pN7qtSxTbTz1EYaxDX1p4g8KtpFy d8tqgUtvYIn/JAGUSDUT0iuO9iBTtNvtBt/aLqY3tyYAqZlYsWAW8wAtrTTiB+f2fsrdc1 wVbnEaUnqVK5Udl/X9KFvQC+ShMvxDA2iDzVH2efmG6yIAbs1/V6OoHdNMN41Z4cjHSMBm 6lvcvayNKy0D86GMvxWwS9lNXXhGZ7yoCzFFX4T/NqGvznsomOHikZ1whQQEWQ== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:25 +0200 Subject: [PATCH yocto-autobuilder2 09/10] b4-config: Add basic b4 configuration MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-9-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=660; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=IGO0VLkONfppPBejsLIyP4119ueXJPi/xfZrG8SXO20=; b=9UUksSlBVVhesstqkwId/XJyiOz8HLIF4PyYRvmWj/X4MICpr/lEp3j4oyiADRXeQPE+iRi73 KSXEucLwi6ZBvX+ITjyr/AoD8Z9tOWuWfjWMhWlnIWEBzmiGx8q9nER X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2285 Allow to easily prepare mail series with b4. Most of the configuration was shamelessly stolen from openembedded-core git. Signed-off-by: Mathieu Dubois-Briand --- .b4-config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.b4-config b/.b4-config new file mode 100644 index 0000000000000000000000000000000000000000..0f1f430c74f3312f121648b9fba31c20a5e37628 --- /dev/null +++ b/.b4-config @@ -0,0 +1,4 @@ +[b4] + send-series-to = yocto-patches@lists.yoctoproject.org + prep-pre-flight-checks = disable-needs-auto-to-cc, disable-needs-checking + send-prefixes = yocto-autobuilder2 From patchwork Tue Oct 7 14:37:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 71775 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 5C587CCA470 for ; Tue, 7 Oct 2025 14:37:34 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.web11.20537.1759847850592881055 for ; Tue, 07 Oct 2025 07:37:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=X+XcqI8q; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 4E2DD1A1169 for ; Tue, 7 Oct 2025 14:37:29 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2554E606C8 for ; Tue, 7 Oct 2025 14:37:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 7A88F102F216C; Tue, 7 Oct 2025 16:37:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1759847848; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=YGm0E++8pFamb5mmqDR2WDQThC+SyjyNYuyBwA13qUM=; b=X+XcqI8qI1NCnTaswR7tbZGZoi8257MNoeWoznql87/sO+Do7VAk5BqIzQ/HzlSZaN7Ogb N8HArWD21D341RzaWQ/MLkljU/CeiLOEmaLn5dMQw159IcKKejQIcVx5D1RI1XAT+vTENo /QaIHVb64pVbHDS7944ceBip5Pr2BiZ7dE1m+BwCnWR0ZNctmT3xSSUlfJoqYpQ5rTT29R 0hACZ1ZoUAMMpUZag/XjkMkhgCzQdqprJ/ZRpB7rxJEcOSVh/BPiVTMQGCWFKqtgxQzMHp 1Pb+KZmAaRqFE4AS6+OyeoTNCIx0bIWez/+k9FB1HJ7qZcmtk6PqyWY43bhI/w== From: Mathieu Dubois-Briand Date: Tue, 07 Oct 2025 16:37:26 +0200 Subject: [PATCH yocto-autobuilder2 10/10] builders: provide builder name to getproperties.py MIME-Version: 1.0 Message-Id: <20251007-contrib-mathieu-bb-setup-links-v1-10-bb1d79289c3f@bootlin.com> References: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> In-Reply-To: <20251007-contrib-mathieu-bb-setup-links-v1-0-bb1d79289c3f@bootlin.com> To: yocto-patches@lists.yoctoproject.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759847841; l=1827; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=EGvpIB8+E7eDYtjJSBQUKCLKFX3Bd8iCIqxVFg4geZE=; b=kpKwMJiBqv9ej/K6OLfGVuorqojG5FPujIe5goolNogcVvq6D+PMdZBcxg/08nyAgqBxIEdao K1cxyMqxs5fD+BTErkfO7VwvA9jzIg8CBjzNHBbqnON9WbIZ8PXTmoa X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Oct 2025 14:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2286 Provide the builder name to the getproperties.py script, allowing to extract data about build configuration, such as MACHINE or DISTRO. The script does validate the number of arguments, so we remain compatible with older versions of autobuilder helper that do not use this new one. Signed-off-by: Mathieu Dubois-Briand --- builders.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builders.py b/builders.py index 2fb0bf827b0f08fb822320ad9fc858592e606cc7..18c119aa76173cbd1f394d3c995a4f88b977291f 100644 --- a/builders.py +++ b/builders.py @@ -137,7 +137,7 @@ 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"), + command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"), extract_fn=extract_json_props, name='Load build revisions', haltOnFailure=True)) @@ -342,7 +342,7 @@ 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"), + command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"), extract_fn=extract_json_props, name='Load build revisions', haltOnFailure=True))