customize

This commit is contained in:
AF 2023-08-05 17:33:40 +00:00
parent 76474a2773
commit 42e61f8ceb
2 changed files with 39 additions and 48 deletions

View File

@ -29,7 +29,7 @@ assert CLIENT_SECRET
c["workers"] = [ c["workers"] = [
worker.Worker("worker-rust-1-65", "pass", properties={"rust_version": "1.65"}), 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"] 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} env = {"CARGO_TARGET_DIR": CARGO_TARGET_DIR}
DOC_DIR = f"{CARGO_TARGET_DIR}/doc" DOC_DIR = f"{CARGO_TARGET_DIR}/doc"
factory = util.BuildFactory()
factory.addStep( def basic_factory():
steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental") 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( factory.addStep(
steps.ShellCommand( steps.ShellCommand(
command=["cargo", "test"], command=["cargo", "test"],
env=env, env=env,
) )
) )
c["builders"].append( append_factory(factory, "cargo test", rust_workers)
util.BuilderConfig(name="runtests", workernames=rust_workers, factory=factory)
)
builderNames.append("runtests")
factory = util.BuildFactory() factory = basic_factory()
factory.addStep(
steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
)
factory.addStep( factory.addStep(
steps.ShellCommand( steps.ShellCommand(
command=[ command=[
@ -122,15 +130,9 @@ factory.addStep(
env=env, env=env,
) )
) )
c["builders"].append( append_factory(factory, "cargo clippy", rust_workers)
util.BuilderConfig(name="clippy", workernames=rust_workers, factory=factory)
)
builderNames.append("clippy")
factory = util.BuildFactory() factory = basic_factory()
factory.addStep(
steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
)
factory.addStep( factory.addStep(
steps.ShellCommand( steps.ShellCommand(
command=[ command=[
@ -159,15 +161,9 @@ factory.addStep(
url="https://radn.parrrate.ru/latest/docs/radn_rs/", url="https://radn.parrrate.ru/latest/docs/radn_rs/",
) )
) )
c["builders"].append( append_factory(factory, "cargo doc", rust_workers)
util.BuilderConfig(name="rustdoc", workernames=rust_workers, factory=factory)
)
builderNames.append("rustdoc")
factory = util.BuildFactory() factory = basic_factory()
factory.addStep(
steps.Git(repourl="https://gitea.parrrate.ru/PTV/radn-rs.git", mode="incremental")
)
factory.addStep( factory.addStep(
steps.ShellCommand( steps.ShellCommand(
command=[ command=[
@ -179,10 +175,7 @@ factory.addStep(
env=env, env=env,
) )
) )
c["builders"].append( append_factory(factory, "cargo fmt", rust_workers)
util.BuilderConfig(name="fmt-check", workernames=rust_workers, factory=factory)
)
builderNames.append("fmt-check")
####### SCHEDULERS ####### SCHEDULERS

View File

@ -44,7 +44,6 @@ services:
- buildbot-db - buildbot-db
rust-worker-1-65: rust-worker-1-65:
image: "buildbot-worker-parrrate-rust"
build: build:
context: ../worker context: ../worker
args: args:
@ -58,20 +57,19 @@ services:
networks: networks:
- buildbot-worker - buildbot-worker
# rust-worker-1-71: rust-worker-1-71:
# image: "buildbot-worker-parrrate-rust" build:
# build: context: ../worker
# context: ../worker args:
# args: - RUST_VERSION_ARG=1.71
# - RUST_VERSION_ARG=1.71 environment:
# environment: BUILDMASTER: buildbot
# BUILDMASTER: buildbot BUILDMASTER_PORT: 9989
# BUILDMASTER_PORT: 9989 WORKERNAME: worker-rust-1-71
# WORKERNAME: worker-rust-1-71 WORKERPASS: pass
# WORKERPASS: pass WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
# WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST networks:
# networks: - buildbot-worker
# - buildbot-worker
nginx: nginx:
container_name: buildbot-nginx container_name: buildbot-nginx