From patchwork Fri Sep 25 16:32:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 99240 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 2FE97C98328 for ; Fri, 25 Sep 2026 16:32:49 +0000 (UTC) Received: from mail-wr2-f12.google.com (mail-wr2-f12.google.com [74.125.225.76]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.2428.1790353966679824138 for ; Fri, 25 Sep 2026 09:32:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=dDHGEkuV; spf=pass (domain: linuxfoundation.org, ip: 74.125.225.76, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-4843f22dcb8so869209f8f.0 for ; Fri, 25 Sep 2026 09:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1790353965; x=1790958765; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=sCmhdxQe6u6AjDyNOAH4acQDF8HU/ZPAyw0zy342bWo=; b=dDHGEkuVAFOHMJclYQawrMg0yY50VGvaePSTf6vuwpy0FDBWQphC9duHKka6qIFZrQ LQhWrRoiKQwPDImD2/CcOFI7kGVlGZbg+I3j3VqZmvWJNshh+KiBSk7zc1msONac0EqF V8kr1NYFPvrxoU4/zE3wQseeTsS+5CICCnMMM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790353965; x=1790958765; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to:content-type; bh=sCmhdxQe6u6AjDyNOAH4acQDF8HU/ZPAyw0zy342bWo=; b=bjKjG/5eAkPyO6zsWct7h4/PyPTb6uC7dYwlxg5iDMoJXez0ejcTDdulI/vogPQDIg 06QFvEsZGECI/+4ucsqFCeNCmK3DoPHk58xU+TiBbLCi7THuNtWItkXe83zjlcGjYLfB 59yPy5mAFVbSckzCcL1U6suQaRxdRxmoV7dURblZBXZ10FveVxYiFh0VhroEfjqHwr9U dYsZKuyO0ZI+7CmJeLijE1u7eBJpLzr0KV9IYmi4JuJpbuX5UublfATo2FUtVQKXvted ED3KK8QOMJ7ubNB/ionbp5bQI0S1E43I8VteDj55SmkGa4SvHWCjqVJvEnFkHInEWWYM hd+Q== X-Gm-Message-State: AFuF++kG9zzch4TP42hv2yafjig4KrmLL4u4AXb20U+gyNLr+rqnsn5L eDKBkm5vHnfP12r9o4V/DXwDvsmEjXhXI81Tx2FB2gJcQ+NA8vH1Pzxtxdx/I1exvdGCqkemWnF BHNMXCIE= X-Gm-Gg: AYBFou1gMNz6xK/1bfOMLNWVmSvQtuXNHBdtfYc892fFqGJ4GKAxEJj6hzhGoAmVnXC sAkt8HybA2NQ/56uNKZvYx5KHyCX/pn3jWr0f5+0gCEP8eyhhLPH7vL8mXDAkD9sq6yHZOXYaKP 9EkxRi+Qnli+80Y+Vtn7fZhwf17xZZ1CkEYaGPl6B12s9+034q2lEhhmEnKxHW+kSapsUkyQ/Wj sodrU6ancbiL2LVntodbnOY6FZNSiowV8GfosXRgZ/InstVGnKx/sgem4Jdel9R3r3e2SyNBHzX x3JpNE7DMgDyzJH95bXgjyESfftONrxcnkKhsSVinZLXmCcFc4B2Hoc/B2VOZp8LaJbVktZ1TLX Mk2Cum99BCE1mZUnIs7wWQj+ZDT8SsYndrxLOuMKOkTQekER3fPYGjlI39XJb0GCcBxPuKXjcEf 3Gj1q7OQ/vGBO9nCuK8xlQ1V1NBFCXXsWBuJjBOyFPq5mbPCWCCSUIbNOPFHJl3M32vebCExN9z JoJnXYK+YKnKfCsC3/tVPO3UKRAWR2saN4Vcuc= X-Received: by 2002:adf:e19c:0:b0:487:11c3:b004 with SMTP id ffacd0b85a97d-488719760c4mr11461103f8f.52.1790353964465; Fri, 25 Sep 2026 09:32:44 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:63ad:54b4:d74c:3436]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4887a30bcdbsm8410100f8f.2.2026.09.25.09.32.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 09:32:43 -0700 (PDT) From: Richard Purdie To: bitbake-devel@lists.openembedded.org Subject: [PATCH v2] toaster: Update fixtures for blacksail Date: Fri, 25 Sep 2026 17:32:42 +0100 Message-ID: <20260925163242.2011665-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 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 ; Fri, 25 Sep 2026 16:32:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/20256 This adds blacksail to the toaster fixxtures list, runs the gen_fixtures script to update the xml files and tests. It also manually updates some of the tests since the position of "master" moved in the list. I've parameterised it with MASTER_PROJECT_ID so it can be controlled from one place in future at least. I did also spot a '2' that was probably meant to refer to master as well so I've included that. Signed-off-by: Richard Purdie --- lib/toaster/orm/fixtures/gen_fixtures.py | 8 +- lib/toaster/orm/fixtures/oe-core.xml | 54 ++++++---- lib/toaster/orm/fixtures/poky.xml | 102 +++++++++++++----- .../tests/functional/functional_helpers.py | 2 + .../functional/test_create_new_project.py | 32 ++++-- .../tests/functional/test_functional_basic.py | 4 +- .../tests/functional/test_project_config.py | 4 +- .../tests/functional/test_project_page.py | 4 +- .../test_project_page_tab_config.py | 10 +- 9 files changed, 151 insertions(+), 69 deletions(-) diff --git a/lib/toaster/orm/fixtures/gen_fixtures.py b/lib/toaster/orm/fixtures/gen_fixtures.py index 937f1ff882e..58961d8ebb4 100755 --- a/lib/toaster/orm/fixtures/gen_fixtures.py +++ b/lib/toaster/orm/fixtures/gen_fixtures.py @@ -35,12 +35,14 @@ verbose = False # [0=Codename, 1=Yocto Project Version, 2=Release Date, 3=Current Version, 4=Support Level, 5=Poky Version, 6=BitBake branch] current_releases = [ # Release slot #1 - ['Wrynose','6.0','April 2026','6.0 (April 2026)','Long Term Support (until April 2030)','','2.18'], + ['Blacksail','6.1','October 2026','6.1 (October 2026)','Support for 7 months (until April 2027)','','2.20'], # Release slot #2 'local' - ['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'], + ['Wrynose','6.0','April 2026','6.0 (April 2026)','Long Term Support (until April 2030)','','2.18'], # Release slot #3 'master' - ['Master','master','','Yocto Project master','master','','master'], + ['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'], # Release slot #4 + ['Master','master','','Yocto Project master','master','','master'], + # Release slot #5 ['Scarthgap','5.0','April 2024','5.0 (April 2024)','Long Term Support (until April 2028)','','2.8'], #['Whinlatter','5.3','October 2025','5.3 (October 2024)','Support for 7 months (until May 2026)','','2.14'], #['Styhead','5.1','November 2024','5.1.0 (November 2024)','Support for 7 months (until May 2025)','','2.10'], diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml index 9197e160c67..ccd8457a2db 100644 --- a/lib/toaster/orm/fixtures/oe-core.xml +++ b/lib/toaster/orm/fixtures/oe-core.xml @@ -8,52 +8,64 @@ - wrynose - git://git.openembedded.org/bitbake - 2.16 + blacksail + https://git.openembedded.org/bitbake + 2.20 + wrynose + https://git.openembedded.org/bitbake + 2.18 + + HEAD - git://git.openembedded.org/bitbake + https://git.openembedded.org/bitbake HEAD - + master - git://git.openembedded.org/bitbake + https://git.openembedded.org/bitbake master - + scarthgap - git://git.openembedded.org/bitbake + https://git.openembedded.org/bitbake 2.8 + blacksail + Openembedded Blacksail + 1 + blacksail + Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=blacksail\">OpenEmbedded Blacksail</a> branch. + + wrynose Openembedded Wrynose - 1 + 2 wrynose Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=wrynose\">OpenEmbedded Wrynose</a> branch. - + local Local Openembedded - 2 + 3 HEAD Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer. - + master OpenEmbedded core master - 3 + 4 master Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch. - + scarthgap Openembedded Scarthgap - 4 + 5 scarthgap Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=scarthgap\">OpenEmbedded Scarthgap</a> branch. @@ -75,15 +87,19 @@ 4 openembedded-core + + 5 + openembedded-core + openembedded-core - git://git.openembedded.org/openembedded-core - https://cgit.openembedded.org/openembedded-core - https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch% - https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch% + https://git.openembedded.org/openembedded-core + https://git.openembedded.org/openembedded-core + https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch% + https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch% 1 diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml index b1b3861d687..d4c1ddfd5d9 100644 --- a/lib/toaster/orm/fixtures/poky.xml +++ b/lib/toaster/orm/fixtures/poky.xml @@ -8,24 +8,30 @@ + blacksail + https://git.openembedded.org/bitbake + 2.20 + + + wrynose https://git.openembedded.org/bitbake 2.18 - + HEAD https://git.openembedded.org/bitbake HEAD - + master https://git.openembedded.org/bitbake master - + scarthgap https://git.openembedded.org/bitbake 2.8 @@ -35,30 +41,37 @@ + blacksail + Yocto Project 6.1 "Blacksail" + 1 + blacksail + Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/?h=blacksail">Yocto Project Blacksail branch</a>. + + wrynose Yocto Project 6.0 "Wrynose" - 1 + 2 wrynose Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/?h=wrynose">Yocto Project Wrynose branch</a>. - + local Local Yocto Project - 2 + 3 HEAD Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer. - + master Yocto Project master - 3 + 4 master Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/">Yocto Project Master branch</a>. - + scarthgap Yocto Project 5.0 "Scarthgap" - 4 + 5 scarthgap Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/?h=scarthgap">Yocto Project Scarthgap branch</a>. @@ -112,6 +125,18 @@ 4 meta-yocto-bsp + + 5 + openembedded-core + + + 5 + meta-poky + + + 5 + meta-yocto-bsp +