Merge lpbuildbot:sync-public-branch-to-prod-branch into lpbuildbot:main

[Tushar Gupta]

[Guruprasad (lgp171188)]

review: Approve

diff --git a/master.cfg b/master.cfg
index 29a00ee..5130da2 100644
--- a/master.cfg
+++ b/master.cfg
@@ -67,28 +67,6 @@ c['schedulers'].append(AggregatingScheduler(
     branch='db-devel',
     treeStableTimer=3*60, treeStableCount=3))
 
-c['schedulers'].append(AggregatingScheduler(
-    name="devel-focal-postgresql14",
-    builderNames=["lp-devel-focal-postgresql14"],
-    branch="master",
-    treeStableTimer=3*60, treeStableCount=3))
-c['schedulers'].append(AggregatingScheduler(
-    name="db-devel-focal-postgresql14",
-    builderNames=["lp-db-devel-focal-postgresql14"],
-    branch="db-devel",
-    treeStableTimer=3*60, treeStableCount=3))
-
-c['schedulers'].append(AggregatingScheduler(
-    name='devel-focal-postgresql16',
-    builderNames=["lp-devel-focal-postgresql16"],
-    branch="master",
-    treeStableTimer=3*60, treeStableCount=3))
-c['schedulers'].append(AggregatingScheduler(
-    name='db-devel-focal-postgresql16',
-    builderNames=["lp-db-devel-focal-postgresql16"],
-    branch="db-devel",
-    treeStableTimer=3*60, treeStableCount=3))
-
 ####### BUILDERS
 
 # the 'builders' list defines the Builders. Each one is configured with a
@@ -205,36 +183,6 @@ c['builders'] = [
         factory=launchpad_test_factory_factory(
             '/var/lib/buildbot/slaves/focal-lxd-worker', 'lptests-focal'),
         locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-devel-focal-postgresql14',
-        slavenames=[''],
-        builddir='lp-devel-focal-postgresql14',
-        factory=launchpad_test_factory_factory(
-            # lptests-focal-postgresql14 is the LXD image name created by the lpbuildbot-worker charm
-            '/var/lib/buildbot/slaves/focal-postgresql14-lxd-worker', 'lptests-focal-postgresql14'),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-db-devel-focal-postgresql14',
-        slavenames=[''],
-        builddir='lp-db-devel-focal-postgresql14',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/focal-postgresql14-lxd-worker', 'lptests-focal-postgresql14'),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-devel-focal-postgresql16',
-        slavenames=[''],
-        builddir='lp-devel-focal-postgresql16',
-        factory=launchpad_test_factory_factory(
-            # lptests-focal-postgresql16 is the LXD image name created by the lpbuildbot-worker charm
-            '/var/lib/buildbot/slaves/focal-postgresql16-lxd-worker', 'lptests-focal-postgresql16'),
-        locks=[build_lock.access('counting')]),
-    BuilderConfig(
-        name='lp-db-devel-focal-postgresql16',
-        slavenames=[''],
-        builddir='lp-db-devel-focal-postgresql16',
-        factory=launchpad_test_factory_factory(
-            '/var/lib/buildbot/slaves/focal-postgresql16-lxd-worker', 'lptests-focal-postgresql16'),
-        locks=[build_lock.access('counting')]),
     ]
 
 ####### STATUS TARGETS
@@ -253,14 +201,6 @@ c['status'].append(
              'lp-devel-focal'),
             ('https://git.launchpad.net/launchpad', 'db-devel',
              'lp-db-devel-focal'),
-            ('https://git.launchpad.net/launchpad', 'master',
-             'lp-devel-focal-postgresql14'),
-            ('https://git.launchpad.net/launchpad', 'db-devel',
-             'lp-db-devel-focal-postgresql14'),
-            ('https://git.launchpad.net/launchpad', 'master',
-             'lp-devel-focal-postgresql16'),
-            ('https://git.launchpad.net/launchpad', 'db-devel',
-             'lp-db-devel-focal-postgresql16'),
             ]))
 
 # Send email to interested users.