From 42e61f8cebdfe3ae89f10664ce2efc14dd6b490b Mon Sep 17 00:00:00 2001
From: timofey <tim@ongoteam.yaconnect.com>
Date: Sat, 5 Aug 2023 17:33:40 +0000
Subject: [PATCH] customize

---
 master.cfg                | 59 +++++++++++++++++----------------------
 simple/docker-compose.yml | 28 +++++++++----------
 2 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/master.cfg b/master.cfg
index e2b5bd8..b2d4e94 100644
--- a/master.cfg
+++ b/master.cfg
@@ -29,7 +29,7 @@ assert CLIENT_SECRET
 
 c["workers"] = [
     worker.Worker("worker-rust-1-65", "pass", properties={"rust_version": "1.65"}),
-    # worker.Worker("worker-rust-1-71", "pass", properties={"rust_version": "1.71"}),
+    worker.Worker("worker-rust-1-71", "pass", properties={"rust_version": "1.71"}),
 ]
 rust_workers = ["worker-rust-1-65"]
 
@@ -89,25 +89,33 @@ CARGO_TARGET_DIR = "/buildbot/_rust/radn-rs/target"
 env = {"CARGO_TARGET_DIR": CARGO_TARGET_DIR}
 DOC_DIR = f"{CARGO_TARGET_DIR}/doc"
 
-factory = util.BuildFactory()
-factory.addStep(
-    steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
-)
+
+def basic_factory():
+    factory = util.BuildFactory()
+    factory.addStep(
+        steps.Git(
+            repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental"
+        )
+    )
+
+
+def append_factory(factory, name: str, workenames: list[str]):
+    c["builders"].append(
+        util.BuilderConfig(name=name, workernames=workenames, factory=factory)
+    )
+    builderNames.append("runtests")
+
+
+factory = basic_factory()
 factory.addStep(
     steps.ShellCommand(
         command=["cargo", "test"],
         env=env,
     )
 )
-c["builders"].append(
-    util.BuilderConfig(name="runtests", workernames=rust_workers, factory=factory)
-)
-builderNames.append("runtests")
+append_factory(factory, "cargo test", rust_workers)
 
-factory = util.BuildFactory()
-factory.addStep(
-    steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
-)
+factory = basic_factory()
 factory.addStep(
     steps.ShellCommand(
         command=[
@@ -122,15 +130,9 @@ factory.addStep(
         env=env,
     )
 )
-c["builders"].append(
-    util.BuilderConfig(name="clippy", workernames=rust_workers, factory=factory)
-)
-builderNames.append("clippy")
+append_factory(factory, "cargo clippy", rust_workers)
 
-factory = util.BuildFactory()
-factory.addStep(
-    steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
-)
+factory = basic_factory()
 factory.addStep(
     steps.ShellCommand(
         command=[
@@ -159,15 +161,9 @@ factory.addStep(
         url="https://radn.parrrate.ru/latest/docs/radn_rs/",
     )
 )
-c["builders"].append(
-    util.BuilderConfig(name="rustdoc", workernames=rust_workers, factory=factory)
-)
-builderNames.append("rustdoc")
+append_factory(factory, "cargo doc", rust_workers)
 
-factory = util.BuildFactory()
-factory.addStep(
-    steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
-)
+factory = basic_factory()
 factory.addStep(
     steps.ShellCommand(
         command=[
@@ -179,10 +175,7 @@ factory.addStep(
         env=env,
     )
 )
-c["builders"].append(
-    util.BuilderConfig(name="fmt-check", workernames=rust_workers, factory=factory)
-)
-builderNames.append("fmt-check")
+append_factory(factory, "cargo fmt", rust_workers)
 
 ####### SCHEDULERS
 
diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml
index b13afd3..8459e72 100644
--- a/simple/docker-compose.yml
+++ b/simple/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       - buildbot-db
 
   rust-worker-1-65:
-    image: "buildbot-worker-parrrate-rust"
     build:
       context: ../worker
       args:
@@ -58,20 +57,19 @@ services:
     networks:
       - buildbot-worker
 
-  # rust-worker-1-71:
-  #   image: "buildbot-worker-parrrate-rust"
-  #   build:
-  #     context: ../worker
-  #     args:
-  #       - RUST_VERSION_ARG=1.71
-  #   environment:
-  #     BUILDMASTER: buildbot
-  #     BUILDMASTER_PORT: 9989
-  #     WORKERNAME: worker-rust-1-71
-  #     WORKERPASS: pass
-  #     WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
-  #   networks:
-  #     - buildbot-worker
+  rust-worker-1-71:
+    build:
+      context: ../worker
+      args:
+        - RUST_VERSION_ARG=1.71
+    environment:
+      BUILDMASTER: buildbot
+      BUILDMASTER_PORT: 9989
+      WORKERNAME: worker-rust-1-71
+      WORKERPASS: pass
+      WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
+    networks:
+      - buildbot-worker
 
   nginx:
     container_name: buildbot-nginx