s

.github/workflows/bbm_check_conf.yml

@@ -5,32 +5,28 @@ on:
   push:
     paths:
       - ".github/workflows/bbm_check_conf.yml"
+      - ".github/workflows/deploy.yml"
       - "autogen/**"
       - "builtbot.tac"
       - "common_factories.py"
       - "constants.py"
+      - "docker-compose/**"
       - "locks.py"
-      - "master-docker-nonstandard/master.cfg"
-      - "master-galera/master.cfg"
-      - "master-nonlatent/master.cfg"
-      - "master-protected-branches/master.cfg"
-      - "master-web/master.cfg"
+      - "master-**"
       - "master.cfg"
       - "utils.py"
       - "validate_master_cfg.sh"
   pull_request:
     paths:
       - ".github/workflows/bbm_check_conf.yml"
+      - ".github/workflows/deploy.yml"
       - "autogen/**"
       - "builtbot.tac"
       - "common_factories.py"
       - "constants.py"
+      - "docker-compose/**"
       - "locks.py"
-      - "master-docker-nonstandard/master.cfg"
-      - "master-galera/master.cfg"
-      - "master-nonlatent/master.cfg"
-      - "master-protected-branches/master.cfg"
-      - "master-web/master.cfg"
+      - "master-**"
       - "master.cfg"
       - "utils.py"
       - "validate_master_cfg.sh"

.github/workflows/deploy.yml

@@ -2,22 +2,6 @@
 name: deploy
 
 on:
-  push:
-    paths:
-      - ".github/workflows/deploy.yml"
-      - "autogen/**"
-      - "docker-compose/**"
-      - "master-**"
-      - "master.cfg"
-      - "rsync.exclude"
-  pull_request:
-    paths:
-      - ".github/workflows/deploy.yml"
-      - "autogen/**"
-      - "docker-compose/**"
-      - "master-**"
-      - "master.cfg"
-      - "rsync.exclude"
   workflow_run:
     workflows: ["bbm-check-conf", "pre-commit"]
     types: [completed]

define_masters.py

@@ -8,8 +8,8 @@
 config = {"private": {}}
 exec(open("master-private.cfg").read(), config, {})
 
-with open("os_info.yaml", "r") as f:
-    os_info = yaml.safe_load(f)
+with open("os_info.yaml", mode="r", encoding="utf-8") as file:
+    os_info = yaml.safe_load(file)
 
 platforms = {}
 
@@ -55,14 +55,17 @@
             "master-docker-" + arch + "-" + str(master_id) + ".log"
         )
 
-        with open(dir_path + "/master-config.yaml", "w") as f:
-            yaml.dump(master_config, f)
+        with open(dir_path + "/master-config.yaml", mode="w", encoding="utf-8") as file:
+            yaml.dump(master_config, file)
 
         shutil.copyfile("master.cfg", dir_path + "/master.cfg")
         shutil.copyfile("master-private.cfg", dir_path + "/master-private.cfg")
 
-        buildbot_tac = open("buildbot.tac", "r").read() % master_config["log_name"]
-        with open(dir_path + "/buildbot.tac", "w") as f:
+        buildbot_tac = (
+            open("buildbot.tac", mode="r", encoding="utf-8").read()
+            % master_config["log_name"]
+        )
+        with open(dir_path + "/buildbot.tac", mode="w", encoding="utf-8") as f:
             f.write(buildbot_tac)
         IDX += 1
     print(arch, len(master_config["builders"]))

docker-compose/.env

@@ -1,4 +1,4 @@
-TITLE="MariaDB CI (DEV)"
+TITLE="MariaDB CI"
 TITLE_URL=https://github.com/MariaDB/server
 BUILDMASTER_URL=https://buildbot.mariadb.org/
 MQ_ROUTER_URL=ws://localhost:8085/ws

docker-compose/.env.dev

@@ -1,5 +1,6 @@
-TITLE="MariaDB CI"
+TITLE="MariaDB CI (DEV)"
 TITLE_URL=https://github.com/MariaDB/server
 BUILDMASTER_URL=https://buildbot.dev.mariadb.org/
 BUILDMASTER_WG_IP=100.64.101.1
 MQ_ROUTER_URL=ws://crossbar:8080/ws
+MASTER_PACKAGES_DIR="/mnt/autofs/master_dev_packages"