From f971b7b22d68cd445ac7ffb44f124c57bff0ddac Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 18 Mar 2018 16:10:12 -0400 Subject: [PATCH] Add an option for dev time: always build all jobs --- ofborg/src/bin/builder.rs | 44 +++++++++++++++++++++++++++------------ ofborg/src/config.rs | 8 +++++++ 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/ofborg/src/bin/builder.rs b/ofborg/src/bin/builder.rs index 1979a4e..f18d6d7 100644 --- a/ofborg/src/bin/builder.rs +++ b/ofborg/src/bin/builder.rs @@ -51,21 +51,38 @@ fn main() { }) .unwrap(); - channel - .declare_queue(easyamqp::QueueConfig { - queue: format!("build-inputs-{}", cfg.nix.system.clone()), - passive: false, - durable: true, - exclusive: false, - auto_delete: false, - no_wait: false, - arguments: None, - }) - .unwrap(); + let queue_name: String; + if cfg.runner.build_all_jobs != Some(true) { + queue_name = channel + .declare_queue(easyamqp::QueueConfig { + queue: format!("build-inputs-{}", cfg.nix.system.clone()), + passive: false, + durable: true, + exclusive: false, + auto_delete: false, + no_wait: false, + arguments: None, + }) + .unwrap().queue; + } else { + warn!("Building all jobs, please don't use this unless you're"); + warn!("developing and have Graham's permission!"); + queue_name = channel + .declare_queue(easyamqp::QueueConfig { + queue: "".to_owned(), + passive: false, + durable: false, + exclusive: true, + auto_delete: true, + no_wait: false, + arguments: None, + }) + .unwrap().queue; + } channel .bind_queue(easyamqp::BindQueueConfig { - queue: format!("build-inputs-{}", cfg.nix.system.clone()), + queue: queue_name.clone(), exchange: "build-jobs".to_owned(), routing_key: None, no_wait: false, @@ -82,7 +99,7 @@ fn main() { cfg.runner.identity.clone(), )), easyamqp::ConsumeConfig { - queue: format!("build-inputs-{}", cfg.nix.system.clone()), + queue: queue_name.clone(), consumer_tag: format!("{}-builder", cfg.whoami()), no_local: false, no_ack: false, @@ -93,6 +110,7 @@ fn main() { ) .unwrap(); + println!("Fetching jobs from {}", &queue_name); channel.start_consuming(); channel.close(200, "Bye").unwrap(); println!("Closed the channel"); diff --git a/ofborg/src/config.rs b/ofborg/src/config.rs index 60613d0..799b3a6 100644 --- a/ofborg/src/config.rs +++ b/ofborg/src/config.rs @@ -62,6 +62,14 @@ pub struct RunnerConfig { pub repos: Option>, pub trusted_users: Option>, pub known_users: Option>, + + /// If true, will create its own queue attached to the build job + /// exchange. This means that builders with this enabled will + /// trigger duplicate replies to the request for this + /// architecture. + /// + /// This should only be turned on for development. + pub build_all_jobs: Option } #[derive(Serialize, Deserialize, Debug)]