From d3bdb14365ca754e83732cccd04e94a2ded5029f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 17 Dec 2021 15:32:21 -0800 Subject: [PATCH] * Add new macos workers * Drop 3.6 and most 3.7 builders * Drop all win32 builders, at least for now * Add some Py3.10 builders --- buildbot/master.cfg | 47 ++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 4e6e0aad..feff8f15 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -43,6 +43,8 @@ import bbpasswd # worker name and password must be configured on the worker. c['workers'] = [ worker.Worker('macosx-1', bbpasswd.PASSWD1, max_builds=1), + worker.Worker('macosx-2', bbpasswd.PASSWD1, max_builds=1), + worker.Worker('macosx-3', bbpasswd.PASSWD1, max_builds=1), worker.Worker('windows-1', bbpasswd.PASSWD1, max_builds=1), worker.Worker('windows-2', bbpasswd.PASSWD1, max_builds=1), worker.Worker('linux-1', bbpasswd.PASSWD1, max_builds=1), @@ -191,39 +193,44 @@ def makeTriggerFactory(): # Organize the builder names into these lists to make it easier to specify them # for the schedulers below, as well as for creating the BuilderConfig objects. -regularBuilders = [ 'build-osx-py36', - 'build-osx-py37', +regularBuilders = [ #'build-osx-py36', + #'build-osx-py37', 'build-osx-py38', 'build-osx-py39', - 'build-gtk2-py36', - 'build-gtk2-py37', + 'build-osx-py310', + #'build-gtk2-py36', + #'build-gtk2-py37', 'build-gtk2-py38', 'build-gtk2-py39', - 'build-gtk3-py36', + #'build-gtk3-py36', 'build-gtk3-py37', 'build-gtk3-py38', 'build-gtk3-py39', - 'build-win32-py36', - 'build-win32-py37', - 'build-win32-py38', - 'build-win32-py39', - 'build-win64-py36', - 'build-win64-py37', + 'build-gtk3-py310', + #'build-win32-py36', + #'build-win32-py37', + #'build-win32-py38', + #'build-win32-py39', + #'build-win64-py36', + #'build-win64-py37', 'build-win64-py38', 'build-win64-py39', + 'build-win64-py310', ] -distBuilders = [ 'dist-osx-py36', - 'dist-osx-py37', +distBuilders = [ #'dist-osx-py36', + #'dist-osx-py37', 'dist-osx-py38', 'dist-osx-py39', - 'dist-win32-py36', - 'dist-win32-py37', - 'dist-win32-py38', - 'dist-win32-py39', - 'dist-win64-py36', + 'dist-osx-py310', + #'dist-win32-py36', + #'dist-win32-py37', + #'dist-win32-py38', + #'dist-win32-py39', + #'dist-win64-py36', 'dist-win64-py37', 'dist-win64-py38', 'dist-win64-py39', + 'dist-win64-py310', ] otherBuilders = [ 'dist-docs-py37', 'dist-src-py37', @@ -234,7 +241,7 @@ triggerBuilders = [ 'trigger-all-dist',] def makeBuilderConfigs(builder_names): def _portToWorker(port): - pwmap = { 'osx': ['macosx-1'], + pwmap = { 'osx': ['macosx-1', 'macosx-2', 'macosx-3'], 'gtk2': ['linux-1', 'linux-2'], 'gtk3': ['linux-1', 'linux-2'], 'win32': ['windows-1', 'windows-2'], @@ -246,7 +253,7 @@ def makeBuilderConfigs(builder_names): for bname in builder_names: btype, port, py = bname.split('-') tags = [btype, port, py] - py = '{}.{}'.format(py[2], py[3]) + py = '{}.{}'.format(py[2], py[3:]) if port == 'docs': BCs.append(util.BuilderConfig( name=bname, tags=tags,