Merge pull request #249 from twisted-infra/synchronize-master.cfg

This is the master.cfg from the Build master.

services/buildbot/master/master.cfg

@@ -263,31 +263,22 @@ builders.append({
     'category': 'supported'})
 
 builders.append({
-    'name': 'ubuntu16.04-pypy5',
-    'builddir': 'ubuntu16.04-pypy5',
+    'name': 'ubuntu16.04-pypy',
+    'builddir': 'ubuntu16.04-pypy',
     'slavenames': ubuntu16_04_slaves,
     'factory': TwistedToxBuildFactory(
         git_update, toxEnv="pypy-alldeps-nocov-posix",
         reactors=["select", "poll", "epoll"]),
     'category': 'unsupported'})
 
 builders.append({
-    'name': 'ubuntu16.04-py3.6',
-    'builddir': 'ubuntu1604-python-3.6',
-    'slavenames': ["rax-ubuntu1604-1"],
+    'name': 'ubuntu16.04-pypy3',
+    'builddir': 'ubuntu16.04-pypy3',
+    'slavenames': ['rax-ubuntu1604-2'],
     'factory': TwistedToxBuildFactory(
-        git_update, toxEnv="py36-alldeps-nocov-posix",
+        git_update, toxEnv="pypy3-alldeps-nocov-posix",
         reactors=["select", "poll", "epoll", "asyncio"]),
-    'category': 'supported'})
-
-builders.append({
-    'name': 'ubuntu16.04-py3.6-coverage',
-    'builddir': 'ubuntu1604-py3.6-coverage',
-    'slavenames': ["rax-ubuntu1604-1"],
-    'factory': TwistedToxCoverageBuildFactory(
-        git_update, toxEnv="py36-alldeps-withcov-posix",
-        buildID="ubuntu1604py3.6"),
-    'category': 'supported'})
+    'category': 'unsupported'})
 
 #
 # Benchmarks
@@ -302,8 +293,17 @@ builders.append({
     'category': 'benchmark'})
 
 builders.append({
-    'name': 'ubuntu16.04-pypy5-benchmark',
-    'builddir': 'ubuntu16.04-pypy5-benchmark',
+    'name': 'ubuntu16.04-pypy3-benchmark',
+    'builddir': 'ubuntu16.04-pypy3-benchmark',
+    'slavenames': ['rax-ubuntu1604-2'],
+    'locks': [twoCPULock.access('counting')],
+    'factory': TwistedBenchmarksFactory(python="pypy3",
+                                        source=git_update),
+        'category': 'benchmark'})
+
+builders.append({
+    'name': 'ubuntu16.04-pypy-benchmark',
+    'builddir': 'ubuntu16.04-pypy-benchmark',
     'slavenames': ['rax-ubuntu1604-2'],
     'locks': [twoCPULock.access('counting')],
     'factory': TwistedBenchmarksFactory(python="pypy",