diff mbox series

[bitbake-devel] toaster: remove styhead

Message ID IA1PR11MB76771BF4DF707E156B0504C5EAC9A@IA1PR11MB7677.namprd11.prod.outlook.com
State New
Headers show
Series [bitbake-devel] toaster: remove styhead | expand

Commit Message

Reyna, David Nov. 17, 2025, 6:01 p.m. UTC 
From d977e6eca7d6fb094b862b9a78472191f31d182a Mon Sep 17 00:00:00 2001
From: David Reyna David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>
Date: Mon, 17 Nov 2025 09:51:35 -0800
Subject: [PATCH] toaster: remove styhead

Remove the now-unsupported Styhead release, move 'Kirkstone' into its place in the table.

[YOCTO #16065]

Signed-off-by: David Reyna David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>
---
lib/toaster/orm/fixtures/gen_fixtures.py |  2 +-
lib/toaster/orm/fixtures/oe-core.xml     | 18 +-----
lib/toaster/orm/fixtures/poky.xml        | 72 +++++-------------------
3 files changed, 15 insertions(+), 77 deletions(-)

     <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">6</field>
-    <field type="CharField" name="branch">styhead</field>
-    <field type="CharField" name="dirpath">meta</field>
-  </object>
-  <object model="orm.layer_version" pk="7">
-    <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
-    <field type="IntegerField" name="layer_source">0</field>
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
     <field type="CharField" name="branch">kirkstone</field>
     <field type="CharField" name="dirpath">meta</field>
   </object>
@@ -260,14 +228,14 @@
     <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field<https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%25path%25?h=%25branch%25%3c/field>>
     <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field<https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%25path%25?h=%25branch%25%3c/field>>
   </object>
-  <object model="orm.layer_version" pk="8">
+  <object model="orm.layer_version" pk="7">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
     <field type="CharField" name="branch">scarthgap</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
-  <object model="orm.layer_version" pk="9">
+  <object model="orm.layer_version" pk="8">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
@@ -275,38 +243,31 @@
     <field type="CharField" name="commit">HEAD</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
-  <object model="orm.layer_version" pk="10">
+  <object model="orm.layer_version" pk="9">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
     <field type="CharField" name="branch">master</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
-  <object model="orm.layer_version" pk="11">
+  <object model="orm.layer_version" pk="10">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
     <field type="CharField" name="branch">whinlatter</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
-  <object model="orm.layer_version" pk="12">
+  <object model="orm.layer_version" pk="11">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
     <field type="CharField" name="branch">walnascar</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
-  <object model="orm.layer_version" pk="13">
+  <object model="orm.layer_version" pk="12">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">6</field>
-    <field type="CharField" name="branch">styhead</field>
-    <field type="CharField" name="dirpath">meta-poky</field>
-  </object>
-  <object model="orm.layer_version" pk="14">
-    <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
-    <field type="IntegerField" name="layer_source">0</field>
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
     <field type="CharField" name="branch">kirkstone</field>
     <field type="CharField" name="dirpath">meta-poky</field>
   </object>
@@ -319,14 +280,14 @@
     <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field<https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%25path%25?h=%25branch%25%3c/field>>
     <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field<https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%25path%25?h=%25branch%25%3c/field>>
   </object>
-  <object model="orm.layer_version" pk="15">
+  <object model="orm.layer_version" pk="13">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
     <field type="CharField" name="branch">scarthgap</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
-  <object model="orm.layer_version" pk="16">
+  <object model="orm.layer_version" pk="14">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
@@ -334,38 +295,31 @@
     <field type="CharField" name="commit">HEAD</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
-  <object model="orm.layer_version" pk="17">
+  <object model="orm.layer_version" pk="15">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
     <field type="CharField" name="branch">master</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
-  <object model="orm.layer_version" pk="18">
+  <object model="orm.layer_version" pk="16">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
     <field type="CharField" name="branch">whinlatter</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
-  <object model="orm.layer_version" pk="19">
+  <object model="orm.layer_version" pk="17">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
     <field type="CharField" name="branch">walnascar</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
-  <object model="orm.layer_version" pk="20">
+  <object model="orm.layer_version" pk="18">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
     <field type="IntegerField" name="layer_source">0</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">6</field>
-    <field type="CharField" name="branch">styhead</field>
-    <field type="CharField" name="dirpath">meta-yocto-bsp</field>
-  </object>
-  <object model="orm.layer_version" pk="21">
-    <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
-    <field type="IntegerField" name="layer_source">0</field>
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
     <field type="CharField" name="branch">kirkstone</field>
     <field type="CharField" name="dirpath">meta-yocto-bsp</field>
   </object>
--
2.43.0

Comments

Mathieu Dubois-Briand Nov. 18, 2025, 9:09 a.m. UTC | #1 
On Mon Nov 17, 2025 at 7:01 PM CET, David via lists.openembedded.org Reyna wrote:
> From d977e6eca7d6fb094b862b9a78472191f31d182a Mon Sep 17 00:00:00 2001
> From: David Reyna David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>
> Date: Mon, 17 Nov 2025 09:51:35 -0800
> Subject: [PATCH] toaster: remove styhead
>
> Remove the now-unsupported Styhead release, move 'Kirkstone' into its place in the table.
>
> [YOCTO #16065]
>
> Signed-off-by: David Reyna David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>
> ---

Hi David,

Thanks for your patch.

It looks like it got somehow corrupt as you sent it. Particularly, lines
like this:

> @@ -80,16 +75,9 @@
>      <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\https://cgit.openembedded.org/openembedded-core/log/?h=walnascar\&gt;OpenEmbedded Walnascar&lt;/a&gt; branch.</field>

The quotes around the URL have somehow been dropped, as it should be
something like:

     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\https://cgit.openembedded.org/openembedded-core/log/?h=walnascar\&gt;OpenEmbedded Walnascar&lt;/a&gt; branch.</field>

Anyway, I took the liberty of fixing your patch. As long as you are OK
with the version in my branch, there is no need to resend.

https://git.openembedded.org/bitbake-contrib/commit/?h=mathieu/master-next&id=d1257f1025531ad2776052215752bfd4c6c951c6

Thanks,
Mathieu
diff mbox series

Patch

diff --git a/lib/toaster/orm/fixtures/gen_fixtures.py b/lib/toaster/orm/fixtures/gen_fixtures.py
index c5b0ab7a7..4b87ba0ba 100755
--- a/lib/toaster/orm/fixtures/gen_fixtures.py
+++ b/lib/toaster/orm/fixtures/gen_fixtures.py
@@ -43,7 +43,7 @@  current_releases = [
     # Release slot #4
     ['Whinlatter','5.3','October 2025','5.3.0 (October 2024)','Support for 7 months (until May 2026)','','2.14'],
     ['Walnascar','5.2','April 2025','5.2.0 (April 2025)','Support for 7 months (until October 2025)','','2.12'],
-    ['Styhead','5.1','November 2024','5.1.0 (November 2024)','Support for 7 months (until May 2025)','','2.10'],
+    #['Styhead','5.1','November 2024','5.1.0 (November 2024)','Support for 7 months (until May 2025)','','2.10'],
     #['Nanbield','4.3','November 2023','4.3.0 (November 2023)','Support for 7 months (until May 2024)','','2.6'],
     #['Mickledore','4.2','April 2023','4.2.0 (April 2023)','Support for 7 months (until October 2023)','','2.4'],
     #['Langdale','4.1','October 2022','4.1.2 (January 2023)','Support for 7 months (until May 2023)','','2.2'],
diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index 264231d13..7c758400c 100644
--- a/lib/toaster/orm/fixtures/oe-core.xml
+++ b/lib/toaster/orm/fixtures/oe-core.xml
@@ -33,11 +33,6 @@ 
     <field type="CharField" name="branch">2.12</field>
   </object>
   <object model="orm.bitbakeversion" pk="6">
-    <field type="CharField" name="name">styhead</field>
-    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
-    <field type="CharField" name="branch">2.10</field>
-  </object>
-  <object model="orm.bitbakeversion" pk="7">
     <field type="CharField" name="name">kirkstone</field>
     <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
     <field type="CharField" name="branch">2.0</field>
@@ -80,16 +75,9 @@ 
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\https://cgit.openembedded.org/openembedded-core/log/?h=walnascar\&gt;OpenEmbedded Walnascar&lt;/a&gt; branch.</field>
   </object>
   <object model="orm.release" pk="6">
-    <field type="CharField" name="name">styhead</field>
-    <field type="CharField" name="description">Openembedded Styhead</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
-    <field type="CharField" name="branch_name">styhead</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\https://cgit.openembedded.org/openembedded-core/log/?h=styhead\&gt;OpenEmbedded Styhead&lt;/a&gt; branch.</field>
-  </object>
-  <object model="orm.release" pk="7">
     <field type="CharField" name="name">kirkstone</field>
     <field type="CharField" name="description">Openembedded Kirkstone</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">7</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
     <field type="CharField" name="branch_name">kirkstone</field>
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\https://cgit.openembedded.org/openembedded-core/log/?h=kirkstone\&gt;OpenEmbedded Kirkstone&lt;/a&gt; branch.</field>
   </object>
@@ -119,10 +107,6 @@ 
     <field rel="ManyToOneRel" to="orm.release" name="release">6</field>
     <field type="CharField" name="layer_name">openembedded-core</field>
   </object>
-  <object model="orm.releasedefaultlayer" pk="7">
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
-    <field type="CharField" name="layer_name">openembedded-core</field>
-  </object>

   <!-- Layer for the Local release -->
diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
index 34b83e971..a8a5a7aeb 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -38,12 +38,6 @@ 
     <field type="CharField" name="dirpath"></field>
   </object>
   <object model="orm.bitbakeversion" pk="6">
-    <field type="CharField" name="name">styhead</field>
-    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
-    <field type="CharField" name="branch">2.10</field>
-    <field type="CharField" name="dirpath"></field>
-  </object>
-  <object model="orm.bitbakeversion" pk="7">
     <field type="CharField" name="name">kirkstone</field>
     <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
     <field type="CharField" name="branch">2.0</field>
@@ -88,16 +82,9 @@ 
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=walnascar&gt;Yocto Project Walnascar branch&lt;/a&gt;.</field>
   </object>
   <object model="orm.release" pk="6">
-    <field type="CharField" name="name">styhead</field>
-    <field type="CharField" name="description">Yocto Project 5.1 "Styhead"</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
-    <field type="CharField" name="branch_name">styhead</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=styhead&gt;Yocto Project Styhead branch&lt;/a&gt;.</field>
-  </object>
-  <object model="orm.release" pk="7">
     <field type="CharField" name="name">kirkstone</field>
     <field type="CharField" name="description">Yocto Project 4.0 "Kirkstone"</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">7</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
     <field type="CharField" name="branch_name">kirkstone</field>
     <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=kirkstone&gt;Yocto Project Kirkstone branch&lt;/a&gt;.</field>
   </object>
@@ -175,18 +162,6 @@ 
     <field rel="ManyToOneRel" to="orm.release" name="release">6</field>
     <field type="CharField" name="layer_name">meta-yocto-bsp</field>
   </object>
-  <object model="orm.releasedefaultlayer" pk="19">
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
-    <field type="CharField" name="layer_name">openembedded-core</field>
-  </object>
-  <object model="orm.releasedefaultlayer" pk="20">
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
-    <field type="CharField" name="layer_name">meta-poky</field>
-  </object>
-  <object model="orm.releasedefaultlayer" pk="21">
-    <field rel="ManyToOneRel" to="orm.release" name="release">7</field>
-    <field type="CharField" name="layer_name">meta-yocto-bsp</field>
-  </object>
   <!-- Default layers provided by poky
        openembedded-core
@@ -241,13 +216,6 @@