diff mbox series

[yocto-autobuilder2,v2] schedulers: Add stable -next/-nut builds to the branch selector

Message ID 20260226144201.47577-1-yoann.congal@smile.fr
State New
Headers show
Series [yocto-autobuilder2,v2] schedulers: Add stable -next/-nut builds to the branch selector | expand

Commit Message

Yoann Congal Feb. 26, 2026, 2:42 p.m. UTC 
From: Yoann Congal <yoann.congal@smile.fr>

These build setups are frequently used for stable maintenance
work. A shortcut is appreciated.

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
 schedulers.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

Comments

Richard Purdie Feb. 26, 2026, 3:11 p.m. UTC | #1 
On Thu, 2026-02-26 at 15:42 +0100, Yoann Congal via lists.yoctoproject.org wrote:
> From: Yoann Congal <yoann.congal@smile.fr>
> 
> These build setups are frequently used for stable maintenance
> work. A shortcut is appreciated.
> 
> Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
> ---
>  schedulers.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 75 insertions(+), 1 deletion(-)

Do we need both -next and -nut?

Cheers,

Richard
Yoann Congal Feb. 26, 2026, 3:17 p.m. UTC | #2 
On Thu Feb 26, 2026 at 4:11 PM CET, Richard Purdie wrote:
> On Thu, 2026-02-26 at 15:42 +0100, Yoann Congal via lists.yoctoproject.org wrote:
>> From: Yoann Congal <yoann.congal@smile.fr>
>> 
>> These build setups are frequently used for stable maintenance
>> work. A shortcut is appreciated.
>> 
>> Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
>> ---
>>  schedulers.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>>  1 file changed, 75 insertions(+), 1 deletion(-)
>
> Do we need both -next and -nut?

It depends on what you want to see in my pull requests for stable
branches. If you find a -nut AB build convincing enough, -nut is enough
and I don't need -next.

I will send a v3 without -next.

> Cheers,
>
> Richard
Richard Purdie Feb. 26, 2026, 3:20 p.m. UTC | #3 
On Thu, 2026-02-26 at 16:17 +0100, Yoann Congal wrote:
> On Thu Feb 26, 2026 at 4:11 PM CET, Richard Purdie wrote:
> > On Thu, 2026-02-26 at 15:42 +0100, Yoann Congal via
> > lists.yoctoproject.org wrote:
> > > From: Yoann Congal <yoann.congal@smile.fr>
> > > 
> > > These build setups are frequently used for stable maintenance
> > > work. A shortcut is appreciated.
> > > 
> > > Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
> > > ---
> > >  schedulers.py | 76
> > > ++++++++++++++++++++++++++++++++++++++++++++++++++-
> > >  1 file changed, 75 insertions(+), 1 deletion(-)
> > 
> > Do we need both -next and -nut?
> 
> It depends on what you want to see in my pull requests for stable
> branches. If you find a -nut AB build convincing enough, -nut is
> enough
> and I don't need -next.
> 
> I will send a v3 without -next.

There isn't any point in me duplicating your builds!

I did wonder if it would be clearer if you just use the -next
namespace, as long as it is in the contrib repos? "nut" is a bit
convoluted. The only reason we have the differences was to differ
between my builds and those of Mathieu, Ross or others.

Cheers,

Richard
Yoann Congal Feb. 26, 2026, 5:22 p.m. UTC | #4 
On Thu Feb 26, 2026 at 4:20 PM CET, Richard Purdie wrote:
> On Thu, 2026-02-26 at 16:17 +0100, Yoann Congal wrote:
>> On Thu Feb 26, 2026 at 4:11 PM CET, Richard Purdie wrote:
>> > On Thu, 2026-02-26 at 15:42 +0100, Yoann Congal via
>> > lists.yoctoproject.org wrote:
>> > > From: Yoann Congal <yoann.congal@smile.fr>
>> > > 
>> > > These build setups are frequently used for stable maintenance
>> > > work. A shortcut is appreciated.
>> > > 
>> > > Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
>> > > ---
>> > >  schedulers.py | 76
>> > > ++++++++++++++++++++++++++++++++++++++++++++++++++-
>> > >  1 file changed, 75 insertions(+), 1 deletion(-)
>> > 
>> > Do we need both -next and -nut?
>> 
>> It depends on what you want to see in my pull requests for stable
>> branches. If you find a -nut AB build convincing enough, -nut is
>> enough
>> and I don't need -next.
>> 
>> I will send a v3 without -next.
>
> There isn't any point in me duplicating your builds!
>
> I did wonder if it would be clearer if you just use the -next
> namespace, as long as it is in the contrib repos? "nut" is a bit
> convoluted. The only reason we have the differences was to differ
> between my builds and those of Mathieu, Ross or others.

For the records, we did discuss this after the bugtriage call:
* I only need the -nut selector (I sent a v3 with -next selector
  removed)
* I keep the -nut branches (for testing on AB and during the review
  request period) as well as the -next branches (for the Pull request
  period)

Regards,

>
> Cheers,
>
> Richard
diff mbox series

Patch

diff --git a/schedulers.py b/schedulers.py
index dd692a4..51d3ba1 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -85,6 +85,28 @@  branchdefaults = {
         'branch_poky': 'master',
         'branch_yocto-docs': 'whinlatter',
     },
+    'whinlatter-next': {
+        'reason': 'Stable maintenance - whinlatter-next',
+        'branch': 'whinlatter',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.16-next',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/whinlatter-next',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/whinlatter-next',
+    },
+    'whinlatter-nut': {
+        'reason': 'Stable maintenance - whinlatter-nut',
+        'branch': 'whinlatter',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.16-nut',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/whinlatter-nut',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/whinlatter-nut',
+    },
     'walnascar': {
         'branch': 'walnascar',
         'branch_poky': 'walnascar',
@@ -141,6 +163,32 @@  branchdefaults = {
         'branch_poky': 'scarthgap',
         'branch_yocto-docs': 'scarthgap',
     },
+    'scarthgap-next': {
+        'reason': 'Stable maintenance - scarthgap-next',
+        'branch': 'scarthgap',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.8-next',
+        'repo_poky': 'ssh://git@push.yoctoproject.org/poky-contrib',
+        'branch_poky': 'stable/scarthgap-next',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/scarthgap-next',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/scarthgap-next',
+    },
+    'scarthgap-nut': {
+        'reason': 'Stable maintenance - scarthgap-nut',
+        'branch': 'scarthgap',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.8-nut',
+        'repo_poky': 'ssh://git@push.yoctoproject.org/poky-contrib',
+        'branch_poky': 'stable/scarthgap-nut',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/scarthgap-nut',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/scarthgap-nut',
+    },
     'nanbield': {
         'branch': 'nanbield',
         'branch_poky': 'nanbield',
@@ -208,6 +256,32 @@  branchdefaults = {
         'branch_poky': 'kirkstone',
         'branch_yocto-docs': 'kirkstone',
     },
+    'kirkstone-next': {
+        'reason': 'Stable maintenance - kirkstone-next',
+        'branch': 'kirkstone',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.0-next',
+        'repo_poky': 'ssh://git@push.yoctoproject.org/poky-contrib',
+        'branch_poky': 'stable/kirkstone-next',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/kirkstone-next',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/kirkstone-next',
+    },
+    'kirkstone-nut': {
+        'reason': 'Stable maintenance - kirkstone-nut',
+        'branch': 'kirkstone',
+        'swat_monitor': False,
+        'repo_bitbake': 'ssh://git@push.openembedded.org/bitbake-contrib',
+        'branch_bitbake': 'stable/2.0-nut',
+        'repo_poky': 'ssh://git@push.yoctoproject.org/poky-contrib',
+        'branch_poky': 'stable/kirkstone-nut',
+        'repo_oecore': 'ssh://git@push.openembedded.org/openembedded-core-contrib',
+        'branch_oecore': 'stable/kirkstone-nut',
+        'repo_meta-yocto': 'ssh://git@push.yoctoproject.org/meta-yocto-contrib',
+        'branch_meta-yocto': 'stable/kirkstone-nut',
+    },
     'honister': {
         'branch': 'honister',
         'branch_poky': 'honister',
@@ -504,7 +578,7 @@  def parent_scheduler(target):
             name="branchselector",
             default="master",
             label="Release Shortcut Selector",
-            choices=["master", "master-next", "mathieu-next", "antonin-next", "mut", "whinlatter", "walnascar", "styhead", "scarthgap", "nanbield", "mickledore", "langdale", "kirkstone", "honister", "hardknott", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
+            choices=["master", "master-next", "mathieu-next", "antonin-next", "mut", "whinlatter", "whinlatter-next", "whinlatter-nut", "walnascar", "styhead", "scarthgap", "scarthgap-next", "scarthgap-nut", "nanbield", "mickledore", "langdale", "kirkstone", "kirkstone-next", "kirkstone-nut", "honister", "hardknott", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
             selectors=branchdefaults),
         util.BooleanParameter(
             name="swat_monitor",