From: Tim Orling <ticotimo@gmail.com>
To: bitbake-devel@lists.openembedded.org, toaster@lists.yoctoproject.org
Subject: [PATCH 3/3] toaster: Add refreshed oe-core and poky fixtures
Date: Sun, 13 Nov 2022 15:30:03 -0800 [thread overview]
Message-ID: <9de8b04297b0281789a4fe051501fede4e65ca0c.1668381699.git.tim.orling@konsulko.com> (raw)
In-Reply-To: <cover.1668381699.git.tim.orling@konsulko.com>
After updating gen_fixtures.py, run ./gen_fixtures.py --all
This includes the latest stable/supported releases.
Currently excludes 'dunfell' as it seems to crash.
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
lib/toaster/orm/fixtures/oe-core.xml | 30 +++--------
lib/toaster/orm/fixtures/poky.xml | 80 ++++++----------------------
2 files changed, 24 insertions(+), 86 deletions(-)
diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index 450e7a2f8..b83b94d5f 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,9 @@
<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>
- </object>
- <object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">hardknott</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">2.2</field>
</object>
<!-- Releases available -->
@@ -56,18 +51,11 @@
<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>
- </object>
- <object model="orm.release" pk="5">
- <field type="CharField" name="name">hardknott</field>
- <field type="CharField" name="description">Openembedded Hardknott</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">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>
<!-- Default layers for each release -->
@@ -87,10 +75,6 @@
<field rel="ManyToOneRel" to="orm.release" name="release">4</field>
<field type="CharField" name="layer_name">openembedded-core</field>
</object>
- <object model="orm.releasedefaultlayer" pk="5">
- <field rel="ManyToOneRel" to="orm.release" name="release">5</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 20fcc0176..6d58a4fdb 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -26,15 +26,9 @@
<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="dirpath">bitbake</field>
- </object>
- <object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">hardknott</field>
- <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
- <field type="CharField" name="branch">hardknott</field>
+ <field type="CharField" name="branch">langdale</field>
<field type="CharField" name="dirpath">bitbake</field>
</object>
@@ -62,18 +56,11 @@
<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>
- </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 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">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>
<!-- Default project layers for each release -->
@@ -125,18 +112,6 @@
<field rel="ManyToOneRel" to="orm.release" name="release">4</field>
<field type="CharField" name="layer_name">meta-yocto-bsp</field>
</object>
- <object model="orm.releasedefaultlayer" pk="13">
- <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
- <field type="CharField" name="layer_name">openembedded-core</field>
- </object>
- <object model="orm.releasedefaultlayer" pk="14">
- <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
- <field type="CharField" name="layer_name">meta-poky</field>
- </object>
- <object model="orm.releasedefaultlayer" pk="15">
- <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
- <field type="CharField" name="layer_name">meta-yocto-bsp</field>
- </object>
<!-- Default layers provided by poky
openembedded-core
@@ -177,14 +152,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">4</field>
- <field type="CharField" name="branch">honister</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">langdale</field>
<field type="CharField" name="dirpath">meta</field>
</object>
@@ -196,14 +164,14 @@
<field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
<field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
</object>
- <object model="orm.layer_version" pk="6">
+ <object model="orm.layer_version" pk="5">
<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">kirkstone</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
- <object model="orm.layer_version" pk="7">
+ <object model="orm.layer_version" pk="6">
<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>
@@ -211,25 +179,18 @@
<field type="CharField" name="commit">HEAD</field>
<field type="CharField" name="dirpath">meta-poky</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">3</field>
<field type="CharField" name="branch">master</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">4</field>
- <field type="CharField" name="branch">honister</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">langdale</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
@@ -241,14 +202,14 @@
<field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
<field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
</object>
- <object model="orm.layer_version" pk="11">
+ <object model="orm.layer_version" pk="9">
<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">kirkstone</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
- <object model="orm.layer_version" pk="12">
+ <object model="orm.layer_version" pk="10">
<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>
@@ -256,25 +217,18 @@
<field type="CharField" name="commit">HEAD</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
- <object model="orm.layer_version" pk="13">
+ <object model="orm.layer_version" pk="11">
<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="14">
+ <object model="orm.layer_version" pk="12">
<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="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">langdale</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
</django-objects>
--
2.34.1
prev parent reply other threads:[~2022-11-13 23:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 23:30 [PATCH 0/3] toaster: update fixtures Tim Orling
2022-11-13 23:30 ` [PATCH 1/3] toaster: fixtures/README: django 1.8 -> 3.2 Tim Orling
2022-11-13 23:30 ` [PATCH 2/3] toaster: fixtures/gen_fixtures.py: update branches Tim Orling
2022-11-13 23:30 ` Tim Orling [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9de8b04297b0281789a4fe051501fede4e65ca0c.1668381699.git.tim.orling@konsulko.com \
--to=ticotimo@gmail.com \
--cc=bitbake-devel@lists.openembedded.org \
--cc=toaster@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).