launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

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

Commit message:
Add lp-devel-bionic-py3 and lp-db-devel-bionic-py3 builders.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot/bionic-py3/+merge/391809
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/lpbuildbot/bionic-py3 into lp:lpbuildbot.

=== modified file 'master.cfg'
--- master.cfg	2020-09-21 14:08:37 +0000
+++ master.cfg	2020-10-05 11:20:37 +0000
@@ -74,7 +74,7 @@
 import lpbuildbot.test
 import lpbuildbot.shell
 
-def addEnvironmentPrepSteps(fac, tree, container):
+def addEnvironmentPrepSteps(fac, tree, container, variables=None):
     fac.addStep(lpbuildbot.shell.ShellCommand(
         command=['./utilities/link-external-sourcecode',
                  '-p', "{}/dependencies".format(tree)],
@@ -116,21 +116,25 @@
     fac.addStep(lpbuildbot.shell.ShellCommand(
         command=['mkdir', 'temp'],
         workdir="{}/devel".format(tree)))
+    build_command = ['/usr/bin/lp-setup-lxd-build', container, tree]
+    if variables:
+        for key, value in variables.items():
+            build_command.append("--variable={}={}".format(key, value))
     fac.addStep(lpbuildbot.shell.ShellCommand(
-        command=['/usr/bin/lp-setup-lxd-build', container, tree],
+        command=build_command,
         description=['building', 'in', 'base', 'lxd', 'container'],
         descriptionDone=['build', 'in', 'base', 'lxd', 'container'],
         workdir="{}/devel".format(tree)))
 
 
-def launchpad_test_factory_factory(tree, container):
+def launchpad_test_factory_factory(tree, container, variables=None):
     f = factory.BuildFactory()
     # default timeout for checkout is 20 minutes (20*60)
     f.addStep(Git(
         'https://git.launchpad.net/launchpad',
         clobberOnFailure=True, mode='full',
         workdir="{}/devel".format(tree)))
-    addEnvironmentPrepSteps(f, tree, container)
+    addEnvironmentPrepSteps(f, tree, container, variables=variables)
     f.addStep(
         lpbuildbot.test.Test(
             timeout=6*60*60,
@@ -169,6 +173,20 @@
         builddir='lp-db-devel-bionic',
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic')),
+    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'})),
+    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'})),
     ]
 
 ####### STATUS TARGETS