Colin Watson has proposed merging lp:~cjwatson/lpbuildbot/drop-xenial into
lp:lpbuildbot.
Commit message:
Drop xenial builders.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot/drop-xenial/+merge/455899
We now only test on focal.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~cjwatson/lpbuildbot/drop-xenial into lp:lpbuildbot.
=== modified file 'buildbot-poll.py'
--- buildbot-poll.py 2020-07-27 15:34:03 +0000
+++ buildbot-poll.py 2023-11-20 16:18:35 +0000
@@ -64,7 +64,7 @@
# Command line argument defaults.
DEFAULTS = {
'buildbot': 'http://lpbuildbot.canonical.com:8010',
- 'builder': 'lp-devel-xenial',
+ 'builder': 'lp-devel-focal',
'local_repository': homepath('archives', 'git', 'launchpad'),
'stable_branch': 'stable',
'quiet': False,
@@ -72,7 +72,7 @@
'db_devel_branch': 'db-devel',
'dry_run': False,
# these bits are for checking on the db branches
- 'db_builder': 'lp-db-devel-xenial',
+ 'db_builder': 'lp-db-devel-focal',
'db_stable_branch': 'db-stable',
}
=== modified file 'master.cfg'
--- master.cfg 2023-11-15 14:03:35 +0000
+++ master.cfg 2023-11-20 16:18:35 +0000
@@ -58,23 +58,15 @@
c['schedulers'] = []
c['schedulers'].append(AggregatingScheduler(
name="devel",
- builderNames=["lp-devel-xenial"],
+ builderNames=["lp-devel-focal"],
branch='master',
treeStableTimer=3*60, treeStableCount=3))
c['schedulers'].append(AggregatingScheduler(
name="db-devel",
- builderNames=["lp-db-devel-xenial"],
+ builderNames=["lp-db-devel-focal"],
branch='db-devel',
treeStableTimer=3*60, treeStableCount=3))
-from buildbot import scheduler
-c['schedulers'].append(scheduler.Triggerable(
- name='lp-devel-focal',
- builderNames=["lp-devel-focal"]))
-c['schedulers'].append(scheduler.Triggerable(
- name='lp-db-devel-focal',
- builderNames=["lp-db-devel-focal"]))
-
####### BUILDERS
# the 'builders' list defines the Builders. Each one is configured with a
@@ -178,20 +170,6 @@
from buildbot.config import BuilderConfig
c['builders'] = [
BuilderConfig(
- name='lp-devel-xenial',
- slavenames=[''],
- 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=[''],
- 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-focal',
slavenames=[''],
builddir='lp-devel-focal',
@@ -220,10 +198,6 @@
http_port=8010, allowForce=False,
forceableBranchBuilderNames=[
('https://git.launchpad.net/launchpad', 'master',
- 'lp-devel-xenial'),
- ('https://git.launchpad.net/launchpad', 'db-devel',
- 'lp-db-devel-xenial'),
- ('https://git.launchpad.net/launchpad', 'master',
'lp-devel-focal'),
('https://git.launchpad.net/launchpad', 'db-devel',
'lp-db-devel-focal'),
@@ -235,7 +209,7 @@
lpbuildbot.mail.MailNotifier(
fromaddr="noreply+build...@launchpad.net",
lookup=lpbuildbot.mail.PassThroughLookup(),
- builders=['lp-devel-xenial', 'lp-db-devel-xenial']))
+ builders=['lp-devel-focal', 'lp-db-devel-focal']))
# Notify the mattermost channel
# this is defined in the production config branch
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
