← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~twom/lpbuildbot/production into lp:lpbuildbot

 

Tom Wardill has proposed merging lp:~twom/lpbuildbot/production into lp:lpbuildbot.

Commit message:
Update webhook url to use bot account

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/lpbuildbot/production/+merge/406923
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~twom/lpbuildbot/production into lp:lpbuildbot.
=== modified file 'master.cfg'
--- master.cfg	2021-07-30 16:44:47 +0000
+++ master.cfg	2021-08-11 10:29:12 +0000
@@ -18,7 +18,10 @@
 # the buildslave's mktap invocation.
 
 from buildbot.buildslave import BuildSlave
-c['slaves'] = []
+c['slaves'] = [
+    BuildSlave("sluagh", "zuo2uaCh"),
+    BuildSlave("radande", "zuo2uaCh"),
+    ]
 
 # 'slavePortnum' defines the TCP port to listen on. This must match the value
 # configured into the buildslaves (with their --master option)
@@ -185,28 +188,28 @@
 c['builders'] = [
     BuilderConfig(
         name='lp-devel-xenial',
-        slavenames=[''],
+        slavenames=['sluagh'],
         builddir='lp-devel-xenial',
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/xenial-lxd-worker', 'lptests-xenial'),
         locks=[build_lock.access('counting')]),
     BuilderConfig(
         name='lp-db-devel-xenial',
-        slavenames=[''],
+        slavenames=['radande'],
         builddir='lp-db-devel-xenial',
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/xenial-lxd-worker', 'lptests-xenial'),
         locks=[build_lock.access('counting')]),
     BuilderConfig(
         name='lp-devel-bionic',
-        slavenames=[''],
+        slavenames=['sluagh'],
         builddir='lp-devel-bionic',
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic'),
         locks=[build_lock.access('counting')]),
     BuilderConfig(
         name='lp-db-devel-bionic',
-        slavenames=[''],
+        slavenames=['radande'],
         builddir='lp-db-devel-bionic',
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/bionic-lxd-worker', 'lptests-bionic'),
@@ -245,13 +248,13 @@
 
 # Notify the mattermost channel
 # this is defined in the production config branch
-mattermost_hook_url = None
+mattermost_hook_url = "https://chat.canonical.com/hooks/ujt438jbhpdojjopfrpdeojizw";
 if mattermost_hook_url:
     import lpbuildbot.mattermost
     c['status'].append(
         lpbuildbot.mattermost.MattermostNotifier(
             mattermost_hook_url,
-            "launchpad-alerts",
+            "launchpad-buildbot",
             "lpbuildbot")) # this is ignored by chat.c.c config