| Message ID | 20250529110852.3072969-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | [yocto-autobuilder2] schedulers: Fix bug in scheduler started job coverage | expand |
> -----Original Message----- > From: yocto-patches@lists.yoctoproject.org <yocto-patches@lists.yoctoproject.org> On Behalf Of Richard Purdie via lists.yoctoproject.org > Sent: den 29 maj 2025 13:09 > To: yocto-patches@lists.yoctoproject.org > Subject: [yocto-patches] [yocto-autobuilder2] [PATCH] schedulers: Fix bug in scheduler started job coverage > > Jobs started by the nightly scheduler were failing as sourcestamps are empty for these. > This meant that additional branch specific target triggers were not being handled and > jobs were being missed. > > Switch to using the yo_build_branch property which was the original intention and yo_build_branch -> yp_build_branch > should always be set, fixing the jobs being started. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > schedulers.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/schedulers.py b/schedulers.py > index 3f0289e8..122149c6 100644 > --- a/schedulers.py > +++ b/schedulers.py > @@ -430,7 +430,7 @@ for builder in config.subbuilders: > @util.renderer > def builderNamesFromConfigQuick(props): > #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props))) > - yp_branch = props.sourcestamps[0]['branch'] > + yp_branch = props.getProperty('yp_build_branch') > > builders = config.trigger_builders_wait_quick > for b in config.trigger_builders_wait_quick_releases: > @@ -443,7 +443,7 @@ def builderNamesFromConfigQuick(props): > @util.renderer > def builderNamesFromConfigFull(props): > #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props))) > - yp_branch = props.sourcestamps[0]['branch'] > + yp_branch = props.getProperty('yp_build_branch') > > builders = config.trigger_builders_wait_full > for b in config.trigger_builders_wait_full_releases: > > //Peter
diff --git a/schedulers.py b/schedulers.py index 3f0289e8..122149c6 100644 --- a/schedulers.py +++ b/schedulers.py @@ -430,7 +430,7 @@ for builder in config.subbuilders: @util.renderer def builderNamesFromConfigQuick(props): #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props))) - yp_branch = props.sourcestamps[0]['branch'] + yp_branch = props.getProperty('yp_build_branch') builders = config.trigger_builders_wait_quick for b in config.trigger_builders_wait_quick_releases: @@ -443,7 +443,7 @@ def builderNamesFromConfigQuick(props): @util.renderer def builderNamesFromConfigFull(props): #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props))) - yp_branch = props.sourcestamps[0]['branch'] + yp_branch = props.getProperty('yp_build_branch') builders = config.trigger_builders_wait_full for b in config.trigger_builders_wait_full_releases:
Jobs started by the nightly scheduler were failing as sourcestamps are empty for these. This meant that additional branch specific target triggers were not being handled and jobs were being missed. Switch to using the yo_build_branch property which was the original intention and should always be set, fixing the jobs being started. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- schedulers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)