launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/lpbuildbot/py3-only into lp:lpbuildbot.

Commit message:
Remove the separate *-py3 builders.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot/py3-only/+merge/406469

Launchpad now defaults to building for Python 3, so we can drop all this complexity.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/lpbuildbot/py3-only into lp:lpbuildbot.

=== modified file 'master.cfg'
--- master.cfg	2021-06-11 11:40:35 +0000
+++ master.cfg	2021-07-30 16:56:21 +0000
@@ -58,12 +58,12 @@
 c['schedulers'] = []
 c['schedulers'].append(AggregatingScheduler(
     name="devel",
-    builderNames=["lp-devel-xenial", "lp-devel-xenial-py3"],
+    builderNames=["lp-devel-xenial"],
     branch='master',
     treeStableTimer=3*60, treeStableCount=3))
 c['schedulers'].append(AggregatingScheduler(
     name="db-devel",
-    builderNames=["lp-db-devel-xenial", "lp-db-devel-xenial-py3"],
+    builderNames=["lp-db-devel-xenial"],
     branch='db-devel',
     treeStableTimer=3*60, treeStableCount=3))
 
@@ -72,14 +72,8 @@
     name='lp-devel-bionic',
     builderNames=["lp-devel-bionic"]))
 c['schedulers'].append(scheduler.Triggerable(
-    name='lp-devel-bionic-py3',
-    builderNames=["lp-devel-bionic-py3"]))
-c['schedulers'].append(scheduler.Triggerable(
     name='lp-db-devel-bionic',
     builderNames=["lp-db-devel-bionic"]))
-c['schedulers'].append(scheduler.Triggerable(
-    name='lp-db-devel-bionic-py3',
-    builderNames=["lp-db-devel-bionic-py3"]))
 
 ####### BUILDERS
 
@@ -204,22 +198,6 @@
             '/var/lib/buildbot/slaves/xenial-lxd-worker', 'lptests-xenial'),
         locks=[build_lock.access('counting')]),
     BuilderConfig(
-        name='lp-devel-xenial-py3',
-        slavenames=[''],
-        builddir='lp-devel-xenial-py3',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/xenial-lxd-worker', 'lptests-xenial',
-            variables={'PYTHON': 'python3'}),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-db-devel-xenial-py3',
-        slavenames=[''],
-        builddir='lp-db-devel-xenial-py3',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/xenial-lxd-worker', 'lptests-xenial',
-            variables={'PYTHON': 'python3'}),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
         name='lp-devel-bionic',
         slavenames=[''],
         builddir='lp-devel-bionic',
@@ -233,22 +211,6 @@
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic'),
         locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-devel-bionic-py3',
-        slavenames=[''],
-        builddir='lp-devel-bionic-py3',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic',
-            variables={'PYTHON': 'python3'}),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-db-devel-bionic-py3',
-        slavenames=[''],
-        builddir='lp-db-devel-bionic-py3',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic',
-            variables={'PYTHON': 'python3'}),
-        locks=[build_lock.access('counting')]),
     ]
 
 ####### STATUS TARGETS
@@ -268,17 +230,9 @@
             ('https://git.launchpad.net/launchpad', 'db-devel',
              'lp-db-devel-xenial'),
             ('https://git.launchpad.net/launchpad', 'master',
-             'lp-devel-xenial-py3'),
-            ('https://git.launchpad.net/launchpad', 'db-devel',
-             'lp-db-devel-xenial-py3'),
-            ('https://git.launchpad.net/launchpad', 'master',
              'lp-devel-bionic'),
             ('https://git.launchpad.net/launchpad', 'db-devel',
              'lp-db-devel-bionic'),
-            ('https://git.launchpad.net/launchpad', 'master',
-             'lp-devel-bionic-py3'),
-            ('https://git.launchpad.net/launchpad', 'db-devel',
-             'lp-db-devel-bionic-py3'),
             ]))
 
 # Send email to interested users.