diff mbox series

[yocto-autobuilder2] Fix docs builder with custom branches

Message ID 20241023095516.3945437-1-mathieu.dubois-briand@bootlin.com
State New
Headers show
Series [yocto-autobuilder2] Fix docs builder with custom branches | expand

Commit Message

Mathieu Dubois-Briand Oct. 23, 2024, 9:55 a.m. UTC 
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

While most of the builds on the autobuilder rely on the
shared-repo-unpack helper script and do not use the Buildbot codebases,
the "docs" builder use Buildbot traditional way to setup sources. As a
consequence, we have to use Buildbot codebases, otherwise the same
branch name is used for all cloned repos.

Add the codebase specifications for all three repos used by the docs
builder. Also remove them from the repos list, as these fields are not
used.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
 builders.py   |  3 +++
 config.py     |  2 +-
 schedulers.py | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/builders.py b/builders.py
index 431744ac275a..ced47def9961 100644
--- a/builders.py
+++ b/builders.py
@@ -382,6 +382,7 @@  def create_doc_builder_factory():
     f.addStep(steps.Git(
         repourl=config.repos["yocto-autobuilder-helper"][0],
         branch=config.repos["yocto-autobuilder-helper"][1],
+        codebase='yocto-autobuilder-helper',
         workdir=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper"),
         mode='incremental',
         haltOnFailure=True,
@@ -389,6 +390,7 @@  def create_doc_builder_factory():
     f.addStep(steps.Git(
         repourl=config.repos["yocto-docs"][0],
         branch=config.repos["yocto-docs"][1],
+        codebase='yocto-docs',
         workdir=util.Interpolate("%(prop:builddir)s/yocto-docs"),
         mode='incremental',
         haltOnFailure=True,
@@ -396,6 +398,7 @@  def create_doc_builder_factory():
     f.addStep(steps.Git(
         repourl=config.repos["bitbake"][0],
         branch=config.repos["bitbake"][1],
+        codebase='bitbake',
         workdir=util.Interpolate("%(prop:builddir)s/bitbake"),
         mode='incremental',
         haltOnFailure=True,
diff --git a/config.py b/config.py
index 7230a5ffbd42..158cc5f2e2ab 100644
--- a/config.py
+++ b/config.py
@@ -27,7 +27,7 @@  buildertorepos = {
     "checkuri": ["poky"],
     "check-layer": ["poky", "meta-mingw", "meta-gplv2"],
     "check-layer-nightly": ["poky", "meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein"],
-    "docs": ["yocto-docs", "bitbake"],
+    "docs": [],
     "reproducible-meta-oe": ["poky", "meta-openembedded"],
     "patchtest": ["poky", "meta-patchtest", "meta-openembedded"],
     "meta-oe-mirror":  ["poky", "meta-openembedded"],
diff --git a/schedulers.py b/schedulers.py
index ec3a085ace8a..64f082c6d562 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -315,7 +315,7 @@  def repos_for_builder(buildername):
 
     parameters = []
     repos = config.buildertorepos.get(buildername)
-    if not repos:
+    if repos is None:
         repos = config.buildertorepos["default"]
     for repo in repos:
         inputs = create_repo_inputs(repo)
@@ -497,6 +497,16 @@  schedulers.append(parent_scheduler("a-full"))
 schedulers.append(sched.ForceScheduler(
         name="docs",
         builderNames=["docs"],
+        codebases=[util.CodebaseParameter(codebase='yocto-autobuilder-helper',
+                                          label="yocto-autobuilder-helper:",
+                                          project=None),
+                   util.CodebaseParameter(codebase='yocto-docs',
+                                          label="yocto-docs:",
+                                          project=None),
+                   util.CodebaseParameter(codebase='bitbake',
+                                          label="bitbake:",
+                                          project=None),
+                   ],
         reason=util.StringParameter(
                 name="reason",
                 label="""Reason (please note the reason for triggering the docs build:""",
@@ -571,7 +581,7 @@  schedulers.append(sched.Nightly(name='sschduler-indexing', branch='master', prop
 # If any of our sphinx docs branches change, trigger a build
 schedulers.append(sched.AnyBranchScheduler(name="yocto-docs-changed",
             change_filter=util.ChangeFilter(project=["yocto-docs"], branch=[None, "master", "master-next", "styhead", "scarthgap", "mickledore", "langdale", "kirkstone", "honister", "hardknott", "gatesgarth", "dunfell", "transition"]),
-            codebases = ['', 'yocto-docs', 'bitbake'],
+            codebases = ['yocto-autobuilder-helper', 'yocto-docs', 'bitbake'],
             treeStableTimer=60,
             builderNames=["docs"]))