From de2607d9c9b63b13dee46728711d275c6d012616 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Tue, 19 Mar 2024 10:46:14 +0100
Subject: [PATCH] Add ENV VAR for bintars worker name/port

---
 docker-compose/.env       | 2 ++
 docker-compose/.env.dev   | 2 ++
 master-bintars/master.cfg | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose/.env b/docker-compose/.env
index 9f42277b..b2aa80d5 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -9,3 +9,5 @@ NGINX_ARTIFACTS_VHOST="ci.mariadb.org"
 ENVIRON="PROD"
 BRANCH="main"
 MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel8-docker"
+MASTER_NONLATENT_BINTARS_WORKER="monty-bbw1-x64"
+MASTER_NONLATENT_BINTARS_WORKER_PORT="10002"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
index d98abcff..21422bd3 100644
--- a/docker-compose/.env.dev
+++ b/docker-compose/.env.dev
@@ -10,3 +10,5 @@ NGINX_ARTIFACTS_VHOST="ci.dev.mariadb.org"
 ENVIRON="DEV"
 BRANCH="dev"
 MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel9-docker"
+MASTER_NONLATENT_BINTARS_WORKER="ro-apexis-bbw03-x64"
+MASTER_NONLATENT_BINTARS_WORKER_PORT="10007"
diff --git a/master-bintars/master.cfg b/master-bintars/master.cfg
index 210aadc5..73a26f41 100644
--- a/master-bintars/master.cfg
+++ b/master-bintars/master.cfg
@@ -71,7 +71,7 @@ c["buildbotURL"] = os.getenv("BUILDMASTER_URL", default="https://buildbot.mariad
 # could connect to your master with this protocol.
 # 'port' must match the value configured into the workers (with their
 # --master option)
-port = int(os.getenv("PORT", default="10002"))
+port = int(os.getenv("MASTER_NONLATENT_BINTARS_WORKER_PORT", default="10002"))
 c["protocols"] = {"pb": {"port": port}}
 
 ####### DB URL
@@ -109,7 +109,7 @@ def mkWorker(name, **kwargs):
 # worker name and password must be configured on the worker.
 c["workers"] = []
 
-c["workers"].append(mkWorker("monty-bbw1-x64", max_builds=1, properties={"jobs": 12}))
+c["workers"].append(mkWorker(os.getenv("MASTER_NONLATENT_BINTARS_WORKER", default="monty-bbw1-x64"), max_builds=1, properties={"jobs": 12}))
 
 
 ####### FACTORY CODE