* [langdale][2.2][PATCH 0/3] toaster: update fixtures
@ 2023-03-14 20:31 Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2 Tim Orling
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tim Orling @ 2023-03-14 20:31 UTC (permalink / raw)
To: bitbake-devel, toaster; +Cc: steve
The toaster fixtures need to be updated for each stable release.
A similar series was already applied to master, but also needs to
be applied to langdale or else toaster is not able to target langdale.
Discovered through crops/toaster-container testing:
https://github.com/crops/toaster-container/actions/runs/4356771460/jobs/7615227153#step:7:322
* Patches 1 and 3 are identical to the same in master
* Patch 2 is slightly different with newer dot releases of stable branches
* Update to latest langdale 4.1.3 and kirkstone 4.0.8
* Re-instate dunfell and update to 3.1.23
- drop comments about bitbake crash
The following changes since (stable/2.2-nut) commit ca911d5be42f8d4d928d0fb911089f1b126e06a0:
cookerdata: Drop dubious exception handling code (2023-03-11 06:09:24 -1000)
are available in the Git repository at:
https://git.openembedded.org/bitbake-contrib timo/toaster-fixtures-langdale
http://cgit.openembedded.org/bitbake-contrib/log/?h=timo/toaster-fixtures-langdale
Tim Orling (3):
toaster: fixtures/README: django 1.8 -> 3.2
toaster: fixtures/gen_fixtures.py: update branches
toaster: Add refreshed oe-core and poky fixtures
lib/toaster/orm/fixtures/README | 2 +-
lib/toaster/orm/fixtures/gen_fixtures.py | 11 ++++----
lib/toaster/orm/fixtures/oe-core.xml | 26 ++++++++---------
lib/toaster/orm/fixtures/poky.xml | 36 ++++++++++++------------
4 files changed, 38 insertions(+), 37 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [langdale][2.2][PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2
2023-03-14 20:31 [langdale][2.2][PATCH 0/3] toaster: update fixtures Tim Orling
@ 2023-03-14 20:31 ` Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 2/3] toaster: fixtures/gen_fixtures.py: update branches Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 3/3] toaster: Add refreshed oe-core and poky fixtures Tim Orling
2 siblings, 0 replies; 4+ messages in thread
From: Tim Orling @ 2023-03-14 20:31 UTC (permalink / raw)
To: bitbake-devel, toaster; +Cc: steve
We should reference the docs for the current LTS version we are using.
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
lib/toaster/orm/fixtures/README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/toaster/orm/fixtures/README b/lib/toaster/orm/fixtures/README
index 1b1c660aa..7cd745e26 100644
--- a/lib/toaster/orm/fixtures/README
+++ b/lib/toaster/orm/fixtures/README
@@ -27,4 +27,4 @@ Data can be provided in XML, JSON and if installed YAML formats.
Use the django management command manage.py loaddata <your fixture file>
For further information see the Django command documentation at:
-https://docs.djangoproject.com/en/1.8/ref/django-admin/#django-admin-loaddata
+https://docs.djangoproject.com/en/3.2/ref/django-admin/#django-admin-loaddata
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [langdale][2.2][PATCH 2/3] toaster: fixtures/gen_fixtures.py: update branches
2023-03-14 20:31 [langdale][2.2][PATCH 0/3] toaster: update fixtures Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2 Tim Orling
@ 2023-03-14 20:31 ` Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 3/3] toaster: Add refreshed oe-core and poky fixtures Tim Orling
2 siblings, 0 replies; 4+ messages in thread
From: Tim Orling @ 2023-03-14 20:31 UTC (permalink / raw)
To: bitbake-devel, toaster; +Cc: steve
Re-introduce Dunfell since it is supported until April 2024
Drop Honister and Hardknott as they are both EOL
Add Langdale as it is the latest stable release
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
lib/toaster/orm/fixtures/gen_fixtures.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/toaster/orm/fixtures/gen_fixtures.py b/lib/toaster/orm/fixtures/gen_fixtures.py
index 0d5f4533b..f0a09be75 100755
--- a/lib/toaster/orm/fixtures/gen_fixtures.py
+++ b/lib/toaster/orm/fixtures/gen_fixtures.py
@@ -35,17 +35,18 @@ verbose = False
# [Codename, Yocto Project Version, Release Date, Current Version, Support Level, Poky Version, BitBake branch]
current_releases = [
# Release slot #1
- ['Kirkstone','3.5','April 2022','','Future - Long Term Support (until Apr. 2024)','27.0','1.54'],
-# ['Dunfell','3.1','April 2021','3.1.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','23.0','1.46'],
+ ['Kirkstone','4.0','April 2022','4.0.8 (March 2023)','Stable - Long Term Support (until Apr. 2024)','','2.0'],
# Release slot #2 'local'
['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'],
# Release slot #3 'master'
['Master','master','','Yocto Project master','master','','master'],
# Release slot #4
- ['Honister','3.4','October 2021','3.4.2 (February 2022)','Support for 7 months (until May 2022)','26.0','1.52'],
-# ['Gatesgarth','3.2','Oct 2020','3.2.4 (May 2021)','EOL','24.0','1.48'],
+ ['Langdale','4.1','October 2022','4.1.3 (March 2023)','Support for 7 months (until May 2023)','','2.2'],
+# ['Honister','3.4','October 2021','3.4.2 (February 2022)','Support for 7 months (until May 2022)','26.0','1.52'],
+# ['Gatesgarth','3.2','Oct 2020','3.2.4 (May 2021)','EOL','24.0','1.48'],
# Optional Release slot #4
- ['Hardknott','3.3','April 2021','3.3.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','25.0','1.50'],
+ ['Dunfell','3.1','April 2021','3.1.23 (February 2023)','Stable - Long Term Support (until Apr. 2024)','23.0','1.46'],
+# ['Hardknott','3.3','April 2021','3.3.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','25.0','1.50'],
]
default_poky_layers = [
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [langdale][2.2][PATCH 3/3] toaster: Add refreshed oe-core and poky fixtures
2023-03-14 20:31 [langdale][2.2][PATCH 0/3] toaster: update fixtures Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2 Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 2/3] toaster: fixtures/gen_fixtures.py: update branches Tim Orling
@ 2023-03-14 20:31 ` Tim Orling
2 siblings, 0 replies; 4+ messages in thread
From: Tim Orling @ 2023-03-14 20:31 UTC (permalink / raw)
To: bitbake-devel, toaster; +Cc: steve
After updating gen_fixtures.py, run ./gen_fixtures.py --all
This includes the latest stable/supported releases.
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
lib/toaster/orm/fixtures/oe-core.xml | 26 ++++++++++----------
lib/toaster/orm/fixtures/poky.xml | 36 ++++++++++++++--------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index 450e7a2f8..615e88aba 100644
--- a/lib/toaster/orm/fixtures/oe-core.xml
+++ b/lib/toaster/orm/fixtures/oe-core.xml
@@ -10,7 +10,7 @@
<object model="orm.bitbakeversion" pk="1">
<field type="CharField" name="name">kirkstone</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">1.54</field>
+ <field type="CharField" name="branch">2.0</field>
</object>
<object model="orm.bitbakeversion" pk="2">
<field type="CharField" name="name">HEAD</field>
@@ -23,14 +23,14 @@
<field type="CharField" name="branch">master</field>
</object>
<object model="orm.bitbakeversion" pk="4">
- <field type="CharField" name="name">honister</field>
+ <field type="CharField" name="name">langdale</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">1.52</field>
+ <field type="CharField" name="branch">2.2</field>
</object>
<object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">hardknott</field>
+ <field type="CharField" name="name">dunfell</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">1.50</field>
+ <field type="CharField" name="branch">1.46</field>
</object>
<!-- Releases available -->
@@ -56,18 +56,18 @@
<field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field>
</object>
<object model="orm.release" pk="4">
- <field type="CharField" name="name">honister</field>
- <field type="CharField" name="description">Openembedded Honister</field>
+ <field type="CharField" name="name">langdale</field>
+ <field type="CharField" name="description">Openembedded Langdale</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
- <field type="CharField" name="branch_name">honister</field>
- <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=honister\">OpenEmbedded Honister</a> branch.</field>
+ <field type="CharField" name="branch_name">langdale</field>
+ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=langdale\">OpenEmbedded Langdale</a> branch.</field>
</object>
<object model="orm.release" pk="5">
- <field type="CharField" name="name">hardknott</field>
- <field type="CharField" name="description">Openembedded Hardknott</field>
+ <field type="CharField" name="name">dunfell</field>
+ <field type="CharField" name="description">Openembedded Dunfell</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
- <field type="CharField" name="branch_name">hardknott</field>
- <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=hardknott\">OpenEmbedded Hardknott</a> branch.</field>
+ <field type="CharField" name="branch_name">dunfell</field>
+ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=dunfell\">OpenEmbedded Dunfell</a> branch.</field>
</object>
<!-- Default layers for each release -->
diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
index 20fcc0176..04e12f96f 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -26,15 +26,15 @@
<field type="CharField" name="dirpath">bitbake</field>
</object>
<object model="orm.bitbakeversion" pk="4">
- <field type="CharField" name="name">honister</field>
+ <field type="CharField" name="name">langdale</field>
<field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
- <field type="CharField" name="branch">honister</field>
+ <field type="CharField" name="branch">langdale</field>
<field type="CharField" name="dirpath">bitbake</field>
</object>
<object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">hardknott</field>
+ <field type="CharField" name="name">dunfell</field>
<field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
- <field type="CharField" name="branch">hardknott</field>
+ <field type="CharField" name="branch">dunfell</field>
<field type="CharField" name="dirpath">bitbake</field>
</object>
@@ -62,18 +62,18 @@
<field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project Master branch</a>.</field>
</object>
<object model="orm.release" pk="4">
- <field type="CharField" name="name">honister</field>
- <field type="CharField" name="description">Yocto Project 3.4 "Honister"</field>
+ <field type="CharField" name="name">langdale</field>
+ <field type="CharField" name="description">Yocto Project 4.1 "Langdale"</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
- <field type="CharField" name="branch_name">honister</field>
- <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=honister">Yocto Project Honister branch</a>.</field>
+ <field type="CharField" name="branch_name">langdale</field>
+ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=langdale">Yocto Project Langdale branch</a>.</field>
</object>
<object model="orm.release" pk="5">
- <field type="CharField" name="name">hardknott</field>
- <field type="CharField" name="description">Yocto Project 3.3 "Hardknott"</field>
+ <field type="CharField" name="name">dunfell</field>
+ <field type="CharField" name="description">Yocto Project 3.1 "Dunfell"</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
- <field type="CharField" name="branch_name">hardknott</field>
- <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=hardknott">Yocto Project Hardknott branch</a>.</field>
+ <field type="CharField" name="branch_name">dunfell</field>
+ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dunfell">Yocto Project Dunfell branch</a>.</field>
</object>
<!-- Default project layers for each release -->
@@ -177,14 +177,14 @@
<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">4</field>
- <field type="CharField" name="branch">honister</field>
+ <field type="CharField" name="branch">langdale</field>
<field type="CharField" name="dirpath">meta</field>
</object>
<object model="orm.layer_version" pk="5">
<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">5</field>
- <field type="CharField" name="branch">hardknott</field>
+ <field type="CharField" name="branch">dunfell</field>
<field type="CharField" name="dirpath">meta</field>
</object>
@@ -222,14 +222,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">4</field>
- <field type="CharField" name="branch">honister</field>
+ <field type="CharField" name="branch">langdale</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
<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">5</field>
- <field type="CharField" name="branch">hardknott</field>
+ <field type="CharField" name="branch">dunfell</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
@@ -267,14 +267,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">4</field>
- <field type="CharField" name="branch">honister</field>
+ <field type="CharField" name="branch">langdale</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
<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">5</field>
- <field type="CharField" name="branch">hardknott</field>
+ <field type="CharField" name="branch">dunfell</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
</django-objects>
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-14 20:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-14 20:31 [langdale][2.2][PATCH 0/3] toaster: update fixtures Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2 Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 2/3] toaster: fixtures/gen_fixtures.py: update branches Tim Orling
2023-03-14 20:31 ` [langdale][2.2][PATCH 3/3] toaster: Add refreshed oe-core and poky fixtures Tim Orling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).