From bedb1e77fe11a5e5e7aa577dbc2db33a2fb8805b Mon Sep 17 00:00:00 2001 From: timofey Date: Sat, 26 Aug 2023 17:25:06 +0000 Subject: [PATCH] customize --- master.cfg | 81 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/master.cfg b/master.cfg index d17d9bf..dc14eb4 100644 --- a/master.cfg +++ b/master.cfg @@ -34,6 +34,7 @@ c["workers"] = [ ] rust_workers_1_65 = ["worker-rust-1-65"] rust_workers_1_71 = ["worker-rust-1-71"] +rust_workers_mdbook = ["worker-rust-1-71"] if "BUILDBOT_MQ_URL" in os.environ: c["mq"] = { @@ -60,11 +61,19 @@ c["change_source"] = [] c["change_source"].append( changes.GitPoller( "https://gitea.parrrate.ru/PTV/radn-rs.git", - workdir="gitpoller-workdir", + workdir="gitpoller/radn-rs", branch="main", pollinterval=300, ) ) +c["change_source"].append( + changes.GitPoller( + "https://gitea.parrrate.ru/PTV/exercises.git", + workdir="gitpoller/exercises", + branch="latest", + pollinterval=300, + ) +) ####### BUILDERS @@ -85,10 +94,11 @@ c["change_source"].append( c["builders"] = [] -builderNames = [] +radn_builders = [] +exercises_builders = [] CARGO_TARGET_DIR = "/buildbot/_rust/radn-rs/target" -env = {"CARGO_TARGET_DIR": CARGO_TARGET_DIR} +RADN_ENV = {"CARGO_TARGET_DIR": CARGO_TARGET_DIR} DOC_DIR = f"{CARGO_TARGET_DIR}/doc" @@ -102,11 +112,28 @@ def radn_rs_factory(): return factory -def append_factory(factory, name: str, workernames: list[str]): +def exercises_factory(): + factory = util.BuildFactory() + factory.addStep( + steps.Git( + repourl="https://gitea.parrrate.ru/PTV/exercises.git", mode="incremental" + ) + ) + return factory + + +def radn_append_factory(factory, name: str, workernames: list[str]): c["builders"].append( util.BuilderConfig(name=name, workernames=workernames, factory=factory) ) - builderNames.append(name) + radn_builders.append(name) + + +def exercises_append_factory(factory, name: str, workernames: list[str]): + c["builders"].append( + util.BuilderConfig(name=name, workernames=workernames, factory=factory) + ) + exercises_builders.append(name) def cargo_test(name: str, workernames: list[str]): @@ -114,10 +141,10 @@ def cargo_test(name: str, workernames: list[str]): factory.addStep( steps.ShellCommand( command=["cargo", "test"], - env=env, + env=RADN_ENV, ) ) - append_factory(factory, name, workernames) + radn_append_factory(factory, name, workernames) def cargo_clippy(name: str, workernames: list[str]): @@ -133,10 +160,10 @@ def cargo_clippy(name: str, workernames: list[str]): "--", "--deny=warnings", ], - env=env, + env=RADN_ENV, ) ) - append_factory(factory, name, workernames) + radn_append_factory(factory, name, workernames) def cargo_fmt(name: str, workernames: list[str]): @@ -149,10 +176,10 @@ def cargo_fmt(name: str, workernames: list[str]): "--check", "--all", ], - env=env, + env=RADN_ENV, ) ) - append_factory(factory, name, workernames) + radn_append_factory(factory, name, workernames) def cargo_doc(name: str, workernames: list[str], specific: bool, latest: bool): @@ -165,7 +192,7 @@ def cargo_doc(name: str, workernames: list[str], specific: bool, latest: bool): "--workspace", "--no-deps", ], - env=env, + env=RADN_ENV, ) ) if specific: @@ -190,7 +217,17 @@ def cargo_doc(name: str, workernames: list[str], specific: bool, latest: bool): compress="gz", ) ) - append_factory(factory, name, workernames) + radn_append_factory(factory, name, workernames) + + +def mdbook_test(name: str, workernames: list[str]): + factory = exercises_factory() + factory.addStep( + steps.ShellCommand( + command=["mdbook", "test", "."], + ) + ) + exercises_append_factory(factory, name, workernames) cargo_test("cargo test (1.65)", rust_workers_1_65) @@ -198,6 +235,7 @@ cargo_clippy("cargo clippy (1.65)", rust_workers_1_65) cargo_clippy("cargo clippy (1.71)", rust_workers_1_71) cargo_fmt("cargo fmt (1.71)", rust_workers_1_71) cargo_doc("cargo doc (1.71)", rust_workers_1_71, False, True) +mdbook_test("mdbook test", rust_workers_mdbook) ####### SCHEDULERS @@ -207,14 +245,25 @@ cargo_doc("cargo doc (1.71)", rust_workers_1_71, False, True) c["schedulers"] = [] c["schedulers"].append( schedulers.SingleBranchScheduler( - name="all", + name="all-radn", change_filter=util.ChangeFilter(branch="main"), treeStableTimer=None, - builderNames=builderNames, + builderNames=radn_builders, ) ) c["schedulers"].append( - schedulers.ForceScheduler(name="force", builderNames=builderNames) + schedulers.SingleBranchScheduler( + name="all-exercises", + change_filter=util.ChangeFilter(branch="latest"), + treeStableTimer=None, + builderNames=radn_builders, + ) +) +c["schedulers"].append( + schedulers.ForceScheduler(name="force", builderNames=radn_builders) +) +c["schedulers"].append( + schedulers.ForceScheduler(name="force", builderNames=exercises_builders) ) ####### REPORTER TARGETS