customize
This commit is contained in:
parent
2be7eab67d
commit
68cd1058fd
12
master.cfg
12
master.cfg
@ -28,8 +28,10 @@ assert CLIENT_SECRET
|
|||||||
# worker name and password must be configured on the worker.
|
# worker name and password must be configured on the worker.
|
||||||
|
|
||||||
c["workers"] = [
|
c["workers"] = [
|
||||||
worker.Worker("worker-rust", "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"}),
|
||||||
]
|
]
|
||||||
|
rust_workers = ["worker-rust-1-65", "worker-rust-1-71"]
|
||||||
|
|
||||||
if "BUILDBOT_MQ_URL" in os.environ:
|
if "BUILDBOT_MQ_URL" in os.environ:
|
||||||
c["mq"] = {
|
c["mq"] = {
|
||||||
@ -98,7 +100,7 @@ factory.addStep(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
c["builders"].append(
|
c["builders"].append(
|
||||||
util.BuilderConfig(name="runtests", workernames=["worker-rust"], factory=factory)
|
util.BuilderConfig(name="runtests", workernames=rust_workers, factory=factory)
|
||||||
)
|
)
|
||||||
builderNames.append("runtests")
|
builderNames.append("runtests")
|
||||||
|
|
||||||
@ -121,7 +123,7 @@ factory.addStep(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
c["builders"].append(
|
c["builders"].append(
|
||||||
util.BuilderConfig(name="clippy", workernames=["worker-rust"], factory=factory)
|
util.BuilderConfig(name="clippy", workernames=rust_workers, factory=factory)
|
||||||
)
|
)
|
||||||
builderNames.append("clippy")
|
builderNames.append("clippy")
|
||||||
|
|
||||||
@ -151,7 +153,7 @@ factory.addStep(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
c["builders"].append(
|
c["builders"].append(
|
||||||
util.BuilderConfig(name="rustdoc", workernames=["worker-rust"], factory=factory)
|
util.BuilderConfig(name="rustdoc", workernames=rust_workers, factory=factory)
|
||||||
)
|
)
|
||||||
builderNames.append("rustdoc")
|
builderNames.append("rustdoc")
|
||||||
|
|
||||||
@ -171,7 +173,7 @@ factory.addStep(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
c["builders"].append(
|
c["builders"].append(
|
||||||
util.BuilderConfig(name="fmt-check", workernames=["worker-rust"], factory=factory)
|
util.BuilderConfig(name="fmt-check", workernames=rust_workers, factory=factory)
|
||||||
)
|
)
|
||||||
builderNames.append("fmt-check")
|
builderNames.append("fmt-check")
|
||||||
|
|
||||||
|
@ -43,13 +43,28 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- buildbot-db
|
- buildbot-db
|
||||||
|
|
||||||
worker:
|
rust-worker-1-65:
|
||||||
image: "buildbot-worker-parrrate-rust"
|
image: "buildbot-worker-parrrate-rust"
|
||||||
build: ../worker
|
build: ../worker
|
||||||
environment:
|
environment:
|
||||||
BUILDMASTER: buildbot
|
BUILDMASTER: buildbot
|
||||||
BUILDMASTER_PORT: 9989
|
BUILDMASTER_PORT: 9989
|
||||||
WORKERNAME: worker-rust
|
WORKERNAME: worker-rust-1-65
|
||||||
|
WORKERPASS: pass
|
||||||
|
WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
|
||||||
|
networks:
|
||||||
|
- buildbot-worker
|
||||||
|
|
||||||
|
rust-worker-1-71:
|
||||||
|
image: "buildbot-worker-parrrate-rust"
|
||||||
|
build:
|
||||||
|
context: ../worker
|
||||||
|
args:
|
||||||
|
- RUST_VERSION=1.71
|
||||||
|
environment:
|
||||||
|
BUILDMASTER: buildbot
|
||||||
|
BUILDMASTER_PORT: 9989
|
||||||
|
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:
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
FROM rust:1.65
|
ARG RUST_VERSION=1.65
|
||||||
|
FROM rust:${RUST_VERSION}
|
||||||
COPY worker-setup.sh worker-setup.sh
|
COPY worker-setup.sh worker-setup.sh
|
||||||
RUN bash worker-setup.sh
|
RUN bash worker-setup.sh
|
||||||
USER buildbot
|
USER buildbot
|
||||||
|
Loading…
Reference in New Issue
Block a user