@@ -35,19 +35,19 @@ 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
- ['Scarthgap','5.0','April 2024','5.0.0 (April 2024)','Long Term Support (until April 2028)','','2.8'],
+ ['Wrynose','6.0','April 2026','6.0 (April 2026)','Long Term Support (until April 2030)','','2.16'],
# 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
- ['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'],
+ ['Scarthgap','5.0','April 2024','5.0 (April 2024)','Long Term Support (until April 2028)','','2.8'],
#['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'],
- ['Kirkstone','4.0','April 2022','4.0.8 (March 2023)','Stable - Long Term Support (until Apr. 2024)','','2.0'],
+ ['Kirkstone','4.0','April 2022','4.0 (March 2023)','Stable - Long Term Support (until Apr. 2024)','','2.0'],
+ ['Whinlatter','5.3','October 2025','5.3 (October 2024)','Support for 7 months (until May 2026)','','2.14'],
#['Honister','3.4','October 2021','3.4.2 (February 2022)','Support for 7 months (until May 2022)','26.0','1.52'],
#['Hardknott','3.3','April 2021','3.3.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','25.0','1.50'],
#['Gatesgarth','3.2','Oct 2020','3.2.4 (May 2021)','EOL','24.0','1.48'],
@@ -8,9 +8,9 @@
<!-- Bitbake versions which correspond to the metadata release -->
<object model="orm.bitbakeversion" pk="1">
- <field type="CharField" name="name">scarthgap</field>
+ <field type="CharField" name="name">wrynose</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.8</field>
+ <field type="CharField" name="branch">2.16</field>
</object>
<object model="orm.bitbakeversion" pk="2">
<field type="CharField" name="name">HEAD</field>
@@ -23,28 +23,28 @@
<field type="CharField" name="branch">master</field>
</object>
<object model="orm.bitbakeversion" pk="4">
- <field type="CharField" name="name">whinlatter</field>
+ <field type="CharField" name="name">scarthgap</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.14</field>
+ <field type="CharField" name="branch">2.8</field>
</object>
<object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">walnascar</field>
+ <field type="CharField" name="name">kirkstone</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.12</field>
+ <field type="CharField" name="branch">2.0</field>
</object>
<object model="orm.bitbakeversion" pk="6">
- <field type="CharField" name="name">kirkstone</field>
+ <field type="CharField" name="name">whinlatter</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.0</field>
+ <field type="CharField" name="branch">2.14</field>
</object>
<!-- Releases available -->
<object model="orm.release" pk="1">
- <field type="CharField" name="name">scarthgap</field>
- <field type="CharField" name="description">Openembedded Scarthgap</field>
+ <field type="CharField" name="name">wrynose</field>
+ <field type="CharField" name="description">Openembedded Wrynose</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
- <field type="CharField" name="branch_name">scarthgap</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=scarthgap\">OpenEmbedded Scarthgap</a> branch.</field>
+ <field type="CharField" name="branch_name">wrynose</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=wrynose\">OpenEmbedded Wrynose</a> branch.</field>
</object>
<object model="orm.release" pk="2">
<field type="CharField" name="name">local</field>
@@ -61,26 +61,26 @@
<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">whinlatter</field>
- <field type="CharField" name="description">Openembedded Whinlatter</field>
+ <field type="CharField" name="name">scarthgap</field>
+ <field type="CharField" name="description">Openembedded Scarthgap</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
- <field type="CharField" name="branch_name">whinlatter</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=whinlatter\">OpenEmbedded Whinlatter</a> branch.</field>
+ <field type="CharField" name="branch_name">scarthgap</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=scarthgap\">OpenEmbedded Scarthgap</a> branch.</field>
</object>
<object model="orm.release" pk="5">
- <field type="CharField" name="name">walnascar</field>
- <field type="CharField" name="description">Openembedded Walnascar</field>
- <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
- <field type="CharField" name="branch_name">walnascar</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=walnascar\">OpenEmbedded Walnascar</a> branch.</field>
- </object>
- <object model="orm.release" pk="6">
<field type="CharField" name="name">kirkstone</field>
<field type="CharField" name="description">Openembedded Kirkstone</field>
- <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
+ <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
<field type="CharField" name="branch_name">kirkstone</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=kirkstone\">OpenEmbedded Kirkstone</a> branch.</field>
</object>
+ <object model="orm.release" pk="6">
+ <field type="CharField" name="name">whinlatter</field>
+ <field type="CharField" name="description">Openembedded Whinlatter</field>
+ <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
+ <field type="CharField" name="branch_name">whinlatter</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=whinlatter\">OpenEmbedded Whinlatter</a> branch.</field>
+ </object>
<!-- Default layers for each release -->
<object model="orm.releasedefaultlayer" pk="1">
@@ -108,6 +108,7 @@
<field type="CharField" name="layer_name">openembedded-core</field>
</object>
+
<!-- Layer for the Local release -->
<object model="orm.layer" pk="1">
<field type="CharField" name="name">openembedded-core</field>
@@ -8,9 +8,9 @@
<!-- Bitbake versions which correspond to the metadata release -->
<object model="orm.bitbakeversion" pk="1">
- <field type="CharField" name="name">scarthgap</field>
+ <field type="CharField" name="name">wrynose</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.8</field>
+ <field type="CharField" name="branch">2.16</field>
<field type="CharField" name="dirpath"></field>
</object>
<object model="orm.bitbakeversion" pk="2">
@@ -26,32 +26,32 @@
<field type="CharField" name="dirpath"></field>
</object>
<object model="orm.bitbakeversion" pk="4">
- <field type="CharField" name="name">whinlatter</field>
+ <field type="CharField" name="name">scarthgap</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.14</field>
+ <field type="CharField" name="branch">2.8</field>
<field type="CharField" name="dirpath"></field>
</object>
<object model="orm.bitbakeversion" pk="5">
- <field type="CharField" name="name">walnascar</field>
+ <field type="CharField" name="name">kirkstone</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.12</field>
+ <field type="CharField" name="branch">2.0</field>
<field type="CharField" name="dirpath"></field>
</object>
<object model="orm.bitbakeversion" pk="6">
- <field type="CharField" name="name">kirkstone</field>
+ <field type="CharField" name="name">whinlatter</field>
<field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
- <field type="CharField" name="branch">2.0</field>
+ <field type="CharField" name="branch">2.14</field>
<field type="CharField" name="dirpath"></field>
</object>
<!-- Releases available -->
<object model="orm.release" pk="1">
- <field type="CharField" name="name">scarthgap</field>
- <field type="CharField" name="description">Yocto Project 5.0 "Scarthgap"</field>
+ <field type="CharField" name="name">wrynose</field>
+ <field type="CharField" name="description">Yocto Project 6.0 "Wrynose"</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
- <field type="CharField" name="branch_name">scarthgap</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=scarthgap">Yocto Project Scarthgap branch</a>.</field>
+ <field type="CharField" name="branch_name">wrynose</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=wrynose">Yocto Project Wrynose branch</a>.</field>
</object>
<object model="orm.release" pk="2">
<field type="CharField" name="name">local</field>
@@ -68,26 +68,26 @@
<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">whinlatter</field>
- <field type="CharField" name="description">Yocto Project 5.3 "Whinlatter"</field>
+ <field type="CharField" name="name">scarthgap</field>
+ <field type="CharField" name="description">Yocto Project 5.0 "Scarthgap"</field>
<field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
- <field type="CharField" name="branch_name">whinlatter</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=whinlatter">Yocto Project Whinlatter branch</a>.</field>
+ <field type="CharField" name="branch_name">scarthgap</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=scarthgap">Yocto Project Scarthgap branch</a>.</field>
</object>
<object model="orm.release" pk="5">
- <field type="CharField" name="name">walnascar</field>
- <field type="CharField" name="description">Yocto Project 5.2 "Walnascar"</field>
- <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
- <field type="CharField" name="branch_name">walnascar</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=walnascar">Yocto Project Walnascar branch</a>.</field>
- </object>
- <object model="orm.release" pk="6">
<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">6</field>
+ <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
<field type="CharField" name="branch_name">kirkstone</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=kirkstone">Yocto Project Kirkstone branch</a>.</field>
</object>
+ <object model="orm.release" pk="6">
+ <field type="CharField" name="name">whinlatter</field>
+ <field type="CharField" name="description">Yocto Project 5.3 "Whinlatter"</field>
+ <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">6</field>
+ <field type="CharField" name="branch_name">whinlatter</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=whinlatter">Yocto Project Whinlatter branch</a>.</field>
+ </object>
<!-- Default project layers for each release -->
<object model="orm.releasedefaultlayer" pk="1">
@@ -180,7 +180,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">1</field>
- <field type="CharField" name="branch">scarthgap</field>
+ <field type="CharField" name="branch">wrynose</field>
<field type="CharField" name="dirpath">meta</field>
</object>
<object model="orm.layer_version" pk="2">
@@ -202,21 +202,21 @@
<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">whinlatter</field>
+ <field type="CharField" name="branch">scarthgap</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">walnascar</field>
+ <field type="CharField" name="branch">kirkstone</field>
<field type="CharField" name="dirpath">meta</field>
</object>
<object model="orm.layer_version" pk="6">
<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">kirkstone</field>
+ <field type="CharField" name="branch">whinlatter</field>
<field type="CharField" name="dirpath">meta</field>
</object>
@@ -232,7 +232,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="branch">wrynose</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
<object model="orm.layer_version" pk="8">
@@ -254,21 +254,21 @@
<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="branch">scarthgap</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
<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="branch">kirkstone</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
<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">kirkstone</field>
+ <field type="CharField" name="branch">whinlatter</field>
<field type="CharField" name="dirpath">meta-poky</field>
</object>
@@ -284,7 +284,7 @@
<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="branch">wrynose</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
<object model="orm.layer_version" pk="14">
@@ -306,21 +306,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">4</field>
- <field type="CharField" name="branch">whinlatter</field>
+ <field type="CharField" name="branch">scarthgap</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
<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="branch">kirkstone</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
<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">kirkstone</field>
+ <field type="CharField" name="branch">whinlatter</field>
<field type="CharField" name="dirpath">meta-yocto-bsp</field>
</object>
</django-objects>
@@ -31,13 +31,30 @@ class TestCreateNewProject(SeleniumFunctionalTestCase):
False,
)
- def test_create_new_project_scarthgap(self):
+ def test_create_new_project_wrynose(self):
""" Test create new project using:
- Project Name: Any string
- - Release: Yocto Project 5.0 "Scarthgap" (option value: 1)
+ - Release: Yocto Project 6.0 "Wrynose" (option value: 1)
- Merge Toaster settings: True
"""
release = '1'
+ release_title = 'Yocto Project 6.0 "Wrynose"'
+ project_name = 'projectwrynose'
+ self.create_new_project(
+ project_name,
+ release,
+ release_title,
+ True,
+ )
+
+
+ def test_create_new_project_scarthgap(self):
+ """ Test create new project using:
+ - Project Name: Any string
+ - Release: Yocto Project 5.0 "Scarthgap" (option value: 4)
+ - Merge Toaster settings: True
+ """
+ release = '4'
release_title = 'Yocto Project 5.0 "Scarthgap"'
project_name = 'projectscarthgap'
self.create_new_project(
@@ -50,10 +67,10 @@ class TestCreateNewProject(SeleniumFunctionalTestCase):
def test_create_new_project_kirkstone(self):
""" Test create new project using:
- Project Name: Any string
- - Release: Yocto Project 4.0 "Kirkstone" (option value: 6)
+ - Release: Yocto Project 4.0 "Kirkstone" (option value: 5)
- Merge Toaster settings: True
"""
- release = '6'
+ release = '5'
release_title = 'Yocto Project 4.0 "Kirkstone"'
project_name = 'projectkirkstone'
self.create_new_project(
Update the fixtures for toaster to add wynose. Update the tests to match. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- lib/toaster/orm/fixtures/gen_fixtures.py | 8 +-- lib/toaster/orm/fixtures/oe-core.xml | 49 ++++++------- lib/toaster/orm/fixtures/poky.xml | 72 +++++++++---------- .../functional/test_create_new_project.py | 25 +++++-- 4 files changed, 86 insertions(+), 68 deletions(-)