Clean-up master.cfg, initial step

master-bintars/master.cfg

@@ -33,7 +33,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### BUILDBOT SERVICES
 

master-docker-nonstandard-2/master.cfg

@@ -32,7 +32,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### BUILDBOT SERVICES
 

master-docker-nonstandard/master.cfg

@@ -32,7 +32,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### BUILDBOT SERVICES
 

master-galera/master.cfg

@@ -26,7 +26,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 FQDN = os.getenv("BUILDMASTER_WG_IP", default="100.64.100.1")
 

master-nonlatent/master.cfg

@@ -32,7 +32,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### PROJECT IDENTITY
 

master-protected-branches/master.cfg

@@ -31,7 +31,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external private file, so
 # that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### BUILDBOT SERVICES
 

master-web/master.cfg

@@ -33,7 +33,7 @@ c = BuildmasterConfig = {}
 # Load the slave, database passwords and 3rd-party tokens from an external
 # private file, so that the rest of the configuration can be public.
 config = {"private": {}}
-exec(open("../master-private.cfg").read(), config, {})
+exec(open("master-private.cfg").read(), config, {})
 
 ####### PROJECT IDENTITY
 

master.cfg

@@ -1,28 +1,40 @@
 # -*- python -*-
 # ex: set filetype=python:
 
-from buildbot.plugins import *
-from buildbot.process.properties import Property, Properties
-from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
-from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
-from buildbot.steps.source.github import GitHub
-from buildbot.process.remotecommand import RemoteCommand
-from datetime import timedelta
-from twisted.internet import defer
-
-import docker
 import os
-import sys
 
-sys.setrecursionlimit(10000)
+import yaml
 
-sys.path.insert(0, "/srv/buildbot/master")
-
-from common_factories import *
-from constants import *
-from locks import *
+from buildbot.plugins import reporters, secrets, steps, util
+from buildbot.process.properties import Property
+from common_factories import (
+    getQuickBuildFactory,
+    getRpmAutobakeFactory,
+    getSourceTarball,
+)
+from constants import (
+    BUILDERS_GALERA_MTR,
+    GITHUB_STATUS_BUILDERS,
+    SAVED_PACKAGE_BRANCHES,
+    os_info,
+)
+from locks import getLocks
 from schedulers_definition import SCHEDULERS
-from utils import *
+from utils import (
+    canStartBuild,
+    createDebRepo,
+    createWorker,
+    dockerfile,
+    hasDockerLibrary,
+    hasFiles,
+    hasInstall,
+    hasUpgrade,
+    ls2string,
+    nextBuild,
+    printEnv,
+    savePackage,
+    uploadDebArtifacts,
+)
 
 with open("master-config.yaml", "r") as f:
     master_config = yaml.safe_load(f)
@@ -31,12 +43,14 @@ with open("master-config.yaml", "r") as f:
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
-# Load the slave, database passwords and 3rd-party tokens from an external private file, so
-# that the rest of the configuration can be public.
+# Load the slave, database passwords and 3rd-party tokens from an external
+# private file, so that the rest of the configuration can be public.
 config = {"private": {}}
 exec(open("master-private.cfg").read(), config, {})
 
-####### BUILDBOT SERVICES
+#######
+# BUILDBOT SERVICES
+#######
 
 # 'services' is a list of BuildbotService items like reporter targets. The
 # status of each build will be pushed to these targets. buildbot/reporters/*.py
@@ -235,7 +249,7 @@ f_deb_autobake.addStep(
             "master_branch": Property("master_branch"),
             "parentbuildername": Property("buildername"),
         },
-        doStepIf=lambda step: savePackage(step),
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_deb_autobake.addStep(
@@ -250,7 +264,7 @@ f_deb_autobake.addStep(
             "master_branch": Property("master_branch"),
             "parentbuildername": Property("buildername"),
         },
-        doStepIf=lambda step: hasInstall(step) and savePackage(step) and hasFiles(step),
+        doStepIf=lambda step: hasInstall(step) and savePackage(step, SAVED_PACKAGE_BRANCHES) and hasFiles(step),
     )
 )
 f_deb_autobake.addStep(
@@ -265,7 +279,7 @@ f_deb_autobake.addStep(
             "master_branch": Property("master_branch"),
             "parentbuildername": Property("buildername"),
         },
-        doStepIf=lambda step: hasUpgrade(step) and savePackage(step) and hasFiles(step),
+        doStepIf=lambda step: hasUpgrade(step) and savePackage(step, SAVED_PACKAGE_BRANCHES) and hasFiles(step),
     )
 )
 f_deb_autobake.addStep(

validate_master_cfg.sh

@@ -50,6 +50,6 @@ for dir in autogen/* \
   $RUNC run -i -v "$(pwd):/srv/buildbot/master" \
     -w /srv/buildbot/master \
     quay.io/mariadb-foundation/bb-master:master \
-    bash -c "cd $dir && buildbot checkconfig master.cfg"
+    bash -c "buildbot checkconfig $dir/master.cfg"
   echo -e "done\n"
 done