Missing MASTER_PACKAGE env var

MariaDB · Oct 20, 2023 · 5e28de0 · 5e28de0
1 parent f9c84b3
commit 5e28de0
Showing 1 changed file with 2 additions and 26 deletions.
diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
@@ -161,32 +161,8 @@ c['workers'].append(worker.DockerLatentWorker("hz-bbw2-docker-eco-mysqljs-nodejs
                     volumes=['/srv/buildbot/eco/mysqljscode:/code'],
                     properties={ 'jobs':7, 'save_packages':False }))
 
-## apexis-bbw1-docker
-#c['workers'].append(worker.DockerLatentWorker("fjord1-docker-ubuntu-1804", None,
-#                    docker_host=config["private"]["docker_workers"]["apexis-bbw1-docker"],
-#                    image="quay.io/mariadb-foundation/bb-worker:ubuntu18.04-clang",
-#                    followStartupLogs=False,
-#                    autopull=True,
-#                    alwaysPull=True,
-#                    masterFQDN=fqdn,
-#                    hostconfig={'shm_size':'6G', 'ulimits': [docker.types.Ulimit(name='memlock', soft=51200000, hard=51200000)]},
-#                    max_builds=1,
-#                    volumes=['/opt/mariadb-buildbot/ccache:/mnt/ccache', '/opt/mariadb-buildbot/packages:/mnt/packages'],
-#                    properties={ 'jobs':7, 'save_packages':False }))
-#
-#c['workers'].append(worker.DockerLatentWorker("fjord2-docker-ubuntu-1804", None,
-#                    docker_host=config["private"]["docker_workers"]["apexis-bbw2-docker"],
-#                    image="quay.io/mariadb-foundation/bb-worker:ubuntu18.04-clang",
-#                    followStartupLogs=False,
-#                    autopull=True,
-#                    alwaysPull=True,
-#                    masterFQDN=fqdn,
-#                    hostconfig={'shm_size':'6G', 'ulimits': [docker.types.Ulimit(name='memlock', soft=51200000, hard=51200000)]},
-#                    max_builds=1,
-#                    volumes=['/opt/mariadb-buildbot/ccache:/mnt/ccache', '/opt/mariadb-buildbot/packages:/mnt/packages'],
-#                    properties={ 'jobs':7, 'save_packages':False }))
-
 ## bm-bbw1-docker
+MASTER_PACKAGES = os.getenv('MASTER_PACKAGES_DIR', default='/mnt/autofs/master_packages')
 c['workers'].append(worker.DockerLatentWorker("bm-bbw1-docker-ubuntu-2004", None,
                     docker_host=config["private"]["docker_workers"]["bm-bbw1-docker"],
                     image="quay.io/mariadb-foundation/bb-worker:ubuntu20.04",
@@ -196,7 +172,7 @@ c['workers'].append(worker.DockerLatentWorker("bm-bbw1-docker-ubuntu-2004", None
                     masterFQDN=fqdn,
                     hostconfig={'shm_size':'20G', 'ulimits': [docker.types.Ulimit(name='memlock', soft=51200000, hard=51200000)]},
                     max_builds=1,
-                    volumes=['/srv/buildbot/ccache:/mnt/ccache', '/mnt/autofs/master_packages:/packages'],
+                    volumes=['/srv/buildbot/ccache:/mnt/ccache', MASTER_PACKAGES+':/packages'],
                     properties={ 'jobs': 2, 'save_packages':False }))
 
 addWorker('hz-bbw', 6, '-bigtest-ubuntu-2004', "quay.io/mariadb-foundation/bb-worker:ubuntu20.04", jobs=20, save_packages=False)