Enable some builders on the release branch

[tstellar]

Fix typo.

[Conanap]

Hello,

Are there any updates on this issue?

[tstellar]

release builders were added in commit a7c344aac55c844c0cac774dce06df783229151b.

buildbot/osuosl/master/config/builders.py

'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
              "-DCMAKE_BUILD_TYPE=Release",
              "-DCLANGD_ENABLE_REMOTE=ON",
              "-DLLVM_ENABLE_ASSERTIONS=ON",
              "-DGRPC_INSTALL_PATH=/usr/local/lib/grpc"
          ])},
 
 
 ]
+
+release_branch_builder_templates = [
+    'llvm-clang-x86_64-expensive-checks-debian'
+    'openmp-clang-x86_64-linux-debian',
+    'libcxx-libcxxabi-x86_64-linux-debian'
+]
+
+def getReleaseBuilders():
+    release_builders = []
+    for builder in all:
+        if builder['name'] not in release_branch_builder_templates:
+            continue
+
+        release_builder = builder.copy
+        release_builder['name'] += '-release'
+        release_builder['builddir'] += '-release'
+        release_builder['tags'].append('release') = 'release/'
+
+        release_builders.append(release_builder)
+    return release_builders
+
+all.extend(getReleaseBuilders())

buildbot/osuosl/master/config/schedulers.py

if cp:
             return True
     return False
 
 
 # Since we have many parametric builders, we dynamically build the minimum set
 # of schedulers, which covers all actually used combinations of dependencies.
 def getSingleBranchSchedulers(
     builders,
+    filter_branch = 'main',
+    filter_branch_re = '^' + filter_branch + '$'
     explicitly_set_schedulers = None,
     **kwargs):
     """
     I'm taking over all of not yet assigned builders with the
     declared source code dependencies, and automatically generate
     a minimum set of SingleBranchSchedulers to handle all the declared
     source code dependency combinations.
     """
 
     builders_with_explicit_schedulers = set()
     if explicitly_set_schedulers:
         # TODO: Make a list of builder names with already set schedulers.
         # builders_with_explicit_schedulers.add(builder)
         pass
 
     # For the builders created with LLVMBuildFactory or similar,
     # we always use automatic schedulers,
     # unless schedulers already explicitly set.
     builders_with_automatic_schedulers = [
         builder for builder in builders
         if builder.name not in builders_with_explicit_schedulers
         if getattr(builder.factory, 'depends_on_projects', None)
     ]
 
-    filter_branch = 'main'
     treeStableTimer = kwargs.get('treeStableTimer', None)
 
     automatic_schedulers = []
 
     # Do we have any to take care of?
     if builders_with_automatic_schedulers:
         # Let's reconsile first to get a unique set of dependencies.
         # We need a set of unique sets of dependent projects.
if builders_with_automatic_schedulers:
                     name=automatic_scheduler_name,
                     treeStableTimer=kwargs.get('treeStableTimer', None),
                     reason="Merge to github %s branch" % filter_branch,
                     builderNames=sch_builders,
                     change_filter=util.ChangeFilter(
                         project_fn= \
                             lambda c, projects_of_interest=frozenset(projects):
                                 isProjectOfInterest(c, projects_of_interest),
-                        branch=filter_branch)
+                        branch_re=filter_branch_re)
                 )
             )
 
             log.msg(
                 "Generated SingleBranchScheduler: { name='%s'" % automatic_scheduler_name,
                 ", builderNames=", sch_builders,
                 ", change_filter=", projects, " (branch: %s)" % filter_branch,
                 ", treeStableTimer=%s" % treeStableTimer,

buildbot/osuosl/master/config/status.py

reporters.GitHubStatusPush(
         str(config.options.get('GitHub Status', 'token')),
         context = Interpolate("%(prop:buildername)s"),
         verbose = True, # TODO: Turn off the verbosity once this is working reliably.
         builders = [
             "llvm-clang-x86_64-expensive-checks-ubuntu",
             "llvm-clang-x86_64-win-fast",
             "clang-x86_64-debian-fast",
             "llvm-clang-x86_64-expensive-checks-debian",
-        ]),
+        ] + [b['name'] for b in config.builders.getReleaseBuilders()])
 
     reporters.IRC(
         useColors = False,
         host = str(config.options.get('IRC', 'host')),
         nick = str(config.options.get('IRC', 'nick')),
         channels = str(config.options.get('IRC', 'channels')).split(','),
         #authz=... # TODO: Consider allowing "harmful" operations to authorizes users.
         useRevisions = False, # FIXME: There is a bug in the buildbot

buildbot/osuosl/master/master.cfg

 ####### BUILDERS
 
 from buildbot.plugins import util
 
 c['builders'] = builders = [
   util.BuilderConfig(**b) for b in config.builders.all
 ]
 
+release_builders = [util.BuilderConfig(**b) for b in config.builders.getReleaseBuilders()]
+c['builders'].extend(release_builders)
+
 ####### SCHEDULERS
 
 c['schedulers'] = config.schedulers.getSingleBranchSchedulers(
-                                        c['builders'])
+                                        builders)
+c['schedulers'].extend(config.schedulers.getSingleBranchSchedulers(
+                                        release_builders, 'release', '^release/[0-9]+\.x$')
 c['schedulers'].extend(config.schedulers.getForceSchedulers(
                                         c['builders']))
 
 ####### BUILDBOT SERVICES
 
 # 'services' is a list of BuildbotService items like reporter targets. The
 # status of each build will be pushed to these targets. buildbot/reporters/*.py
 # has a variety to choose from, like IRC bots.