Skip to contentSkip to conversation

Patch review

PATCH New Yoann Congal 1 participant 3 messages Apr 24

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for scarthgap and have comments back by end of day Tuesday, April 28.

Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/?#/builders/29/builds/3732
But got impacted by 2 intermittent failures:
* qemuarm64-ptest failed with a python3 ptest failure
https://autobuilder.yoctoproject.org/valkyrie/?#/builders/61/builds/3558
* I reported the (new) issue in:
#16267 – [scarthgap] AB-INT PTEST: python3 failure (test_wrong_cert_tls13)
https://bugzilla.yoctoproject.org/show_bug.cgi?id=16267
* successfuly retried as https://autobuilder.yoctoproject.org/valkyrie/?#/builders/61/builds/3559
* oe-selftest-armhost failed to download Rust crates from crates.io in bitbake selftest
https://autobuilder.yoctoproject.org/valkyrie/?#/builders/23/builds/3835
* This bitbake commit did pass in https://autobuilder.yoctoproject.org/valkyrie/?#/builders/23/builds/3814
* This is a really recent issue (it also impacted the 6.0 release build)

The following changes since commit e45f35e484b1aeef7f3a2278720c446949fa77a3:

config.json: Drop checkvnc usage (2026-03-16 20:33:02 +0000)

are available in the Git repository at:

https://git.yoctoproject.org/yocto-autobuilder-helper contrib/ycongal/scarthgap-nut
https://git.yoctoproject.org/yocto-autobuilder-helper/log/?h=contrib/ycongal/scarthgap-nut

for you to fetch changes up to b7119bff3aa6faf31a2e72b33a8fe2040d407bd7:

scripts/yocto-supported-distros: fix the centos stream regular expression (2026-04-17 15:20:43 +0200)

----------------------------------------------------------------

Antonin Godard (1):
scripts/yocto-supported-distros: fix the centos stream regular
expression

Yoann Congal (1):
run-config: drop one more checkvnc usage

 scripts/run-config              |  2 +-
 scripts/yocto-supported-distros | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
#1 lore raw

PATCH 1/2 run-config: drop one more checkvnc usage

From: Yoann Congal <[email protected]>

Reference was missed during a global removal in commit e45f35e484b1 ("config.json: Drop checkvnc usage").

This should prevent this warning on AB:
Xvnc not running, attempting restart

WARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream. Please read /usr/share/doc/tigervnc/HOWTO.md for more information.
Killing Xvnc process ID 4057
Xvnc process ID 4057 already killed

WARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream. Please read /usr/share/doc/tigervnc/HOWTO.md for more information.

New 'stream9-vk1:1 (pokybuild)' desktop is stream9-vk1:1

Starting applications specified in /srv/pokybuild/.vnc/xstartup Log file is /srv/pokybuild/.vnc/stream9-vk1:1.log

[0]: https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/3580/steps/14/logs/stdio

---
 scripts/run-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/run-config +1 -1
index fb71721..02bb8cc 100755
@@ -290,7 +290,7 @@ def handle_stepnum(stepnum):
             addstepentry("test-targets", "QA targets", shortdesc, desc, str(sanitytargets), str(stepnum))
         elif args.stepname == "test-targets":
             hp.printheader("Step %s/%s: Running bitbake %s" % (stepnum, maxsteps, sanitytargets))
-            bitbakecmd(args.builddir, "%s/checkvnc; DISPLAY=:1 bitbake %s -k" % (scriptsdir, sanitytargets), report, stepnum, args.stepname)
+            bitbakecmd(args.builddir, "DISPLAY=:1 bitbake %s -k" % sanitytargets, report, stepnum, args.stepname)
 
     # Run any extra commands specified
     cmds = utils.getconfiglist("EXTRACMDS", ourconfig, args.target, stepnum)
#2 lore raw

PATCH 2/2 scripts/yocto-supported-distros: fix the centos stream regular expression

In reply to Yoann Congal

From: Antonin Godard <[email protected]>

The poky.conf file was wrongly referring these distros with centosstream-*, but this is now fixed. Change the regular expression for CentOS Stream to match this. Remove the CentOS (no Stream) definition as we do not support it anymore and it conflicts with this one.

---
 scripts/yocto-supported-distros | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
scripts/yocto-supported-distros +2 -10
index cdd3967..3266d52 100755
@@ -77,13 +77,9 @@ INPUT_REGEXES = {
         "ab": re.compile(r"^opensuse(\d{2})(\d{1})"),
         "lsb": re.compile(r"^opensuse-(\d{2})\.(\d{1})"),
     },
-    "centos": {
-        "ab": re.compile(r"^centos(\d+)"),
-        "lsb": re.compile(r"^centos-(\d+)"),
-    },
     "centosstream": {
         "ab": re.compile(r"^stream(\d+)"),
-        "lsb": re.compile(r"^stream-(\d+)"),
+        "lsb": re.compile(r"^centos-(\d+)"),
     },
     "rocky": {
         "ab": re.compile(r"^rocky(\d+)"),
@@ -112,12 +108,8 @@ OUTPUT_FORMATS = {
         "lsb": "opensuseleap-{}.{}",
         "docs": "-  OpenSUSE Leap {}.{}",
     },
-    "centos": {
-        "lsb": "centos-{}",
-        "docs": "-  CentOS {}",
-    },
     "centosstream": {
-        "lsb": "centosstream-{}",
+        "lsb": "centos-{}",
         "docs": "-  CentOS Stream {}",
     },
     "rocky": {