From 185ce5e85cc049bf3bca220706175bfc4ed4be39 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Tue, 24 Oct 2023 11:04:54 +0200 Subject: [PATCH] Missing var for galera packages saving --- docker-compose/.env | 1 + docker-compose/.env.dev | 1 + master-galera/master.cfg | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose/.env b/docker-compose/.env index d898f3b1..1647c1b6 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -3,4 +3,5 @@ TITLE_URL=https://github.com/MariaDB/server BUILDMASTER_URL=https://buildbot.mariadb.org/ MQ_ROUTER_URL=ws://localhost:8085/ws MASTER_PACKAGES_DIR="/mnt/autofs/master_packages" +GALERA_PACKAGES_DIR="/mnt/autofs/galera_packages" ARTIFACTS_URL="https://ci.mariadb.org" diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev index 686d130a..323129af 100644 --- a/docker-compose/.env.dev +++ b/docker-compose/.env.dev @@ -4,4 +4,5 @@ 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" +GALERA_PACKAGES_DIR="/mnt/autofs/galera_dev_packages" ARTIFACTS_URL="https://ci.dev.mariadb.org" diff --git a/master-galera/master.cfg b/master-galera/master.cfg index a77b4442..e6828535 100644 --- a/master-galera/master.cfg +++ b/master-galera/master.cfg @@ -114,6 +114,9 @@ c["schedulers"].append(schedulerTrigger) c["workers"] = [] # Docker workers +GALERA_PACKAGES = os.getenv( + "GALERA_PACKAGES_DIR", default="/mnt/autofs/galera_packages" +) workers = {} @@ -139,7 +142,7 @@ def addWorker( volumes=[ "/srv/buildbot/ccache:/mnt/ccache", "/srv/buildbot/packages:/mnt/packages", - "/mnt/autofs/galera_packages/:/packages", + GALERA_PACKAGES + "/:/packages", ], )