getRpmAutobakeFactory does not take in mtrDbPool

MariaDB · Feb 5, 2025 · 0c94f88 · 0c94f88
1 parent 888ffda
commit 0c94f88
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/common_factories.py b/common_factories.py
@@ -626,7 +626,7 @@ def getTests(props):
     return addPostTests(f)
 
 
-def getRpmAutobakeFactory(mtrDbPool):
+def getRpmAutobakeFactory():
     f_rpm_autobake = util.BuildFactory()
     f_rpm_autobake.addStep(printEnv())
     f_rpm_autobake.addStep(

diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg
@@ -5,10 +5,7 @@ import os
 from collections import defaultdict
 
 from buildbot.plugins import steps, util
-from buildbot.process.properties import Property
 from common_factories import (
-    getQuickBuildFactory,
-    getRpmAutobakeFactory,
     getSourceTarball,
 )
 from constants import MTR_ENV, SAVED_PACKAGE_BRANCHES
@@ -21,9 +18,6 @@ from utils import (
     dockerfile,
     filterBranch,
     getHTMLLogString,
-    hasAutobake,
-    hasBigtest,
-    hasEco,
     hasFailed,
     moveMTRLogs,
     mtrJobsMultiplier,
@@ -147,10 +141,6 @@ addWorker(
 
 ####### FACTORY CODE
 
-f_quick_build = getQuickBuildFactory("nm", mtrDbPool)
-f_quick_debug = getQuickBuildFactory("debug", mtrDbPool)
-f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool)
-
 ## f_asan_ubsan_build
 f_asan_ubsan_build = util.BuildFactory()
 f_asan_ubsan_build.addStep(printEnv())

diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
@@ -6,7 +6,6 @@ from collections import defaultdict
 
 import docker
 from buildbot.plugins import steps, util, worker
-from buildbot.process.properties import Property
 from common_factories import (
     addTests,
     getHTMLLogString,
@@ -23,8 +22,6 @@ from utils import (
     createWorker,
     dockerfile,
     filterBranch,
-    hasAutobake,
-    hasBigtest,
     hasFailed,
     moveMTRLogs,
     mtrJobsMultiplier,
@@ -407,7 +404,7 @@ c["workers"].append(
 
 f_quick_build = getQuickBuildFactory("nm", mtrDbPool)
 f_quick_debug = getQuickBuildFactory("debug", mtrDbPool)
-f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool)
+f_rpm_autobake = getRpmAutobakeFactory()
 
 ## f_asan_ubsan_build
 f_asan_ubsan_build = util.BuildFactory()

diff --git a/master.cfg b/master.cfg
@@ -121,7 +121,7 @@ for w_name in master_config["workers"]:
 ####### FACTORY CODE
 
 f_quick_build = getQuickBuildFactory("nm", mtrDbPool)
-f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool)
+f_rpm_autobake = getRpmAutobakeFactory()
 
 f_deb_autobake = util.BuildFactory()
 f_deb_autobake.addStep(printEnv())