From 70f28b0823a0633731d179a3e0bc1286aa892d09 Mon Sep 17 00:00:00 2001
From: timofey <tim@ongoteam.yaconnect.com>
Date: Fri, 4 Aug 2023 20:15:03 +0000
Subject: [PATCH] customize

---
 master.cfg                | 36 ++++++++++++++++++++----------------
 simple/docker-compose.yml | 21 ++++++++++++++++-----
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/master.cfg b/master.cfg
index 10b1d09..fc3064f 100644
--- a/master.cfg
+++ b/master.cfg
@@ -64,11 +64,11 @@ c["schedulers"].append(
         name="all",
         change_filter=util.ChangeFilter(branch="main"),
         treeStableTimer=None,
-        builderNames=["runtests"],
+        builderNames=["runtests", "runtests-gitea"],
     )
 )
 c["schedulers"].append(
-    schedulers.ForceScheduler(name="force", builderNames=["runtests"])
+    schedulers.ForceScheduler(name="force", builderNames=["runtests", "runtests-gitea"])
 )
 
 ####### BUILDERS
@@ -88,9 +88,22 @@ def codebaseGenerator(chdict):
 
 c["codebaseGenerator"] = codebaseGenerator
 
+c["builders"] = []
+
+
 factory = util.BuildFactory()
-# check out the source
+factory.addStep(
+    steps.Git(
+        repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental"
+    )
+)
+factory.addStep(steps.ShellCommand(command=["cargo", "test"]))
+c["builders"].append(
+    util.BuilderConfig(name="runtests", workernames=["example-worker"], factory=factory)
+)
+
 if GITEA_SECRET:
+    factory = util.BuildFactory()
     factory.addStep(
         steps.Gitea(
             repourl="https://gitea.parrrate.ru/PTV/radn-rs.git",
@@ -98,19 +111,10 @@ if GITEA_SECRET:
             codebase="radn-rs",
         )
     )
-else:
-    factory.addStep(
-        steps.Git(
-            repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental"
-        )
+    factory.addStep(steps.ShellCommand(command=["cargo", "test"]))
+    c["builders"].append(
+        util.BuilderConfig(name="runtests-gitea", workernames=["example-worker"], factory=factory)
     )
-# run the tests (note that this will require that 'trial' is installed)
-factory.addStep(steps.ShellCommand(command=["cargo", "test"]))
-
-c["builders"] = []
-c["builders"].append(
-    util.BuilderConfig(name="runtests", workernames=["example-worker"], factory=factory)
-)
 
 ####### REPORTER TARGETS
 
@@ -150,7 +154,7 @@ if GITEA_SECRET:
         "onlyIncludePushCommit": True,
     }
     c["services"].append(
-        reporters.GiteaStatusPush("https://example.com", GITEA_SECRET, verbose=True),
+        reporters.GiteaStatusPush("https://gitea.parrrate.ru", GITEA_SECRET, verbose=True),
     )
 
 ####### DB URL
diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml
index 531c6da..105d991 100644
--- a/simple/docker-compose.yml
+++ b/simple/docker-compose.yml
@@ -1,4 +1,11 @@
 version: '2'
+
+networks:
+  v6d:
+    external: true
+  buildbot-db: {}
+  buildbot-worker: {}
+
 services:
   buildbot:
     image: "buildbot-master-parrrate"
@@ -12,18 +19,23 @@ services:
       - BUILDBOT_WORKER_PORT=9989
       - BUILDBOT_WEB_URL=http://192.168.1.3:8010/
       - BUILDBOT_WEB_PORT=tcp:port=8010
-    links:
-      - db
     depends_on:
       - db
     ports:
       - "8010:8010"
+    networks:
+      - v6d
+      - buildbot-db
+      - buildbot-worker
+  
   db:
     env_file:
       - db.env
     image: "postgres:9.4"
     expose:
       - 5432
+    networks:
+      - buildbot-db
 
   worker:
     image: "buildbot-worker-parrrate-rust"
@@ -34,6 +46,5 @@ services:
       WORKERNAME: example-worker
       WORKERPASS: pass
       WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
-
-    links:
-      - buildbot
+    networks:
+      - buildbot-worker