launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/lpbuildbot/default-xenial into lp:~canonical-launchpad-branches/lpbuildbot/production.

Commit message:
Switch buildbot and buildbot-poll to xenial by default.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot/default-xenial/+merge/330979

Now that all production hosts are on xenial, this should be safe.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/lpbuildbot/default-xenial into lp:~canonical-launchpad-branches/lpbuildbot/production.

=== modified file 'buildbot-poll.py'
--- buildbot-poll.py	2014-08-26 04:46:05 +0000
+++ buildbot-poll.py	2017-09-19 12:14:06 +0000
@@ -90,7 +90,7 @@
 # Command line argument defaults.
 DEFAULTS = {
     'buildbot': 'http://lpbuildbot.canonical.com:8010',
-    'builder': 'lp-devel-precise',
+    'builder': 'lp-devel-xenial',
     'dest_config': homepath('pqm-config', 'launchpad.conf'),
     'success_config': homepath('pqm-config', 'launchpad-success.conf'),
     'failure_config': homepath('pqm-config', 'launchpad-failure.conf'),
@@ -105,7 +105,7 @@
     'pqm_email': 'Launchpad PQM <launchpad@xxxxxxxxxxxxxxxxx>',
     'dry_run': False,
     # these bits are for checking on the db branches
-    'db_builder': 'lp-db-devel-precise',
+    'db_builder': 'lp-db-devel-xenial',
     'db_devel_local_branch': homepath(
         'archives', 'rocketfuel', 'launchpad', 'db-devel'),
     'db_stable_branch': 'lp:~launchpad-pqm/launchpad/db-stable',
@@ -328,10 +328,10 @@
     # landing, we should be in normal mode.
     if (is_revision_clean(
         result, revision, options.devel_branch, options,
-        current_build_reasons['lp-devel-precise'])
+        current_build_reasons['lp-devel-xenial'])
         and is_revision_clean(
                 db_result, db_revision, options.db_devel_local_branch,
-                options, current_build_reasons['lp-db-devel-precise'])):
+                options, current_build_reasons['lp-db-devel-xenial'])):
         set_pqm_mode('normal', options)
     else:
         # Otherwise, we are in testfix mode.

=== modified file 'master.cfg'
--- master.cfg	2017-02-06 18:05:24 +0000
+++ master.cfg	2017-09-19 12:14:06 +0000
@@ -46,11 +46,11 @@
 import bzrbuildbot.scheduler
 c['schedulers'] = []
 c['schedulers'].append(bzrbuildbot.scheduler.AggregatingTestfix(
-    name="devel", builderNames=["lp-devel-precise"],
+    name="devel", builderNames=["lp-devel-xenial"],
     branch='bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel',
     treeStableTimer=3*60, treeStableCount=3))
 c['schedulers'].append(bzrbuildbot.scheduler.AggregatingTestfix(
-    name="db-devel", builderNames=["lp-db-devel-precise"],
+    name="db-devel", builderNames=["lp-db-devel-xenial"],
     branch='bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-devel',
     treeStableTimer=3*60, treeStableCount=3))
 
@@ -144,6 +144,20 @@
 from buildbot.config import BuilderConfig
 c['builders'] = [
     BuilderConfig(
+        name='lp-devel-xenial',
+        slavenames=['sluagh'],
+        builddir='lp-devel-xenial',
+        factory=launchpad_test_factory_factory(
+            '/var/lib/buildbot/slaves/xenial-slave/devel',
+            'lptests-xenial')),
+    BuilderConfig(
+        name='lp-db-devel-xenial',
+        slavenames=['radande'],
+        builddir='lp-db-devel-xenial',
+        factory=launchpad_test_factory_factory(
+            '/var/lib/buildbot/slaves/xenial-slave/devel',
+            'lptests-xenial')),
+    BuilderConfig(
         name='lp-devel-precise',
         slavenames=['sluagh'],
         builddir='lp-devel-precise',
@@ -157,20 +171,6 @@
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/precise-slave/devel',
             'lptests-precise')),
-    BuilderConfig(
-        name='lp-devel-xenial',
-        slavenames=['sluagh'],
-        builddir='lp-devel-xenial',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/xenial-slave/devel',
-            'lptests-xenial')),
-    BuilderConfig(
-        name='lp-db-devel-xenial',
-        slavenames=['radande'],
-        builddir='lp-db-devel-xenial',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/xenial-slave/devel',
-            'lptests-xenial')),
     ]
 
 ####### STATUS TARGETS
@@ -185,10 +185,10 @@
     bzrbuildbot.web.WebStatus(
         http_port=8010, allowForce=False,
         forceableBranchBuilderNames=[
+            ('lp:~launchpad-pqm/launchpad/devel', 'lp-devel-xenial'),
+            ('lp:~launchpad-pqm/launchpad/db-devel', 'lp-db-devel-xenial'),
             ('lp:~launchpad-pqm/launchpad/devel', 'lp-devel-precise'),
             ('lp:~launchpad-pqm/launchpad/db-devel', 'lp-db-devel-precise'),
-            ('lp:~launchpad-pqm/launchpad/devel', 'lp-devel-xenial'),
-            ('lp:~launchpad-pqm/launchpad/db-devel', 'lp-db-devel-xenial'),
             ]))
 
 from buildbot.status import mail
@@ -199,7 +199,7 @@
     mail.MailNotifier(
         fromaddr="canonical-launchpad@xxxxxxxxxxxxxxxxxxx",
         lookup=bzrbuildbot.mail.PassThroughLookup(),
-        builders=['lp-devel-precise', 'lp-db-devel-precise']))
+        builders=['lp-devel-xenial', 'lp-db-devel-xenial']))
 c['status'].append(
     mail.MailNotifier(
         fromaddr="losas@xxxxxxxxxxxxx",
@@ -207,7 +207,7 @@
                          "canonical-launchpad@xxxxxxxxxxxxxxxxxxx"],
         mode='failing',
         sendToInterestedUsers=False,
-        builders=['lp-devel-precise', 'lp-db-devel-precise']))
+        builders=['lp-devel-xenial', 'lp-db-devel-xenial']))
 
 # at the time of this writing, the buildbot IRC client does not support SSL
 # so we would need to modify buildbot to use this.  Supposedly Twisted's IRC