diff --git a/master.cfg b/master.cfg index b7151a9..0112484 100644 --- a/master.cfg +++ b/master.cfg @@ -28,8 +28,10 @@ assert CLIENT_SECRET # worker name and password must be configured on the worker. 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: c["mq"] = { @@ -98,7 +100,7 @@ factory.addStep( ) ) c["builders"].append( - util.BuilderConfig(name="runtests", workernames=["worker-rust"], factory=factory) + util.BuilderConfig(name="runtests", workernames=rust_workers, factory=factory) ) builderNames.append("runtests") @@ -121,7 +123,7 @@ factory.addStep( ) ) c["builders"].append( - util.BuilderConfig(name="clippy", workernames=["worker-rust"], factory=factory) + util.BuilderConfig(name="clippy", workernames=rust_workers, factory=factory) ) builderNames.append("clippy") @@ -151,7 +153,7 @@ factory.addStep( ) ) c["builders"].append( - util.BuilderConfig(name="rustdoc", workernames=["worker-rust"], factory=factory) + util.BuilderConfig(name="rustdoc", workernames=rust_workers, factory=factory) ) builderNames.append("rustdoc") @@ -171,7 +173,7 @@ factory.addStep( ) ) 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") diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index 849abf7..6c24c40 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -43,13 +43,28 @@ services: networks: - buildbot-db - worker: + rust-worker-1-65: image: "buildbot-worker-parrrate-rust" build: ../worker environment: BUILDMASTER: buildbot 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 WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST networks: diff --git a/worker/Dockerfile b/worker/Dockerfile index f9be6bc..c8f5037 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:1.65 +ARG RUST_VERSION=1.65 +FROM rust:${RUST_VERSION} COPY worker-setup.sh worker-setup.sh RUN bash worker-setup.sh USER buildbot