Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[workspace]
members = [
"common",
"deploy",
"gateway",
"gateway-client",
"gateway-messages",
Expand Down Expand Up @@ -29,6 +30,7 @@ members = [

default-members = [
"common",
"deploy",
"gateway",
"gateway-client",
"gateway-messages",
Expand Down
1 change: 1 addition & 0 deletions deploy/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
26 changes: 26 additions & 0 deletions deploy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[package]
name = "omicron-deploy"
description = "Tools for deploying Omicron software to target machines"
version = "0.1.0"
edition = "2021"
license = "MPL-2.0"

[dependencies]
anyhow = "1.0"
crossbeam = "0.8"
omicron-sled-agent = { path = "../sled-agent" }
omicron-package = { path = "../package" }
serde = { version = "1.0", features = [ "derive" ] }
serde_derive = "1.0"
structopt = "0.3"
thiserror = "1.0"

# Disable doc builds by default for our binaries to work around issue
# rust-lang/cargo#8373. These docs would not be very useful anyway.
[[bin]]
name = "sled-agent-overlay-files"
doc = false

[[bin]]
name = "thing-flinger"
doc = false
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,16 @@ fn do_sync(config: &Config) -> Result<()> {
Ok(())
}

// Build omicron-package and omicron-sled-agent on the builder
// Build omicron-package and omicron-deploy on the builder
//
// We need to build omicron-sled-agent for overlay file generation
// We need to build omicron-deploy for overlay file generation
fn do_build_minimal(config: &Config) -> Result<()> {
let server = &config.servers[&config.builder.server];
let cmd = format!(
"cd {} && cargo build -p {} -p {}",
config.builder.omicron_path.to_string_lossy(),
"omicron-package",
"omicron-sled-agent"
"omicron-deploy"
);
ssh_exec(&server, &cmd, false)
}
Expand Down
7 changes: 1 addition & 6 deletions package/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[package]
name = "omicron-package"
description = "Tools for building and installing Omicron packages"
version = "0.1.0"
edition = "2021"
license = "MPL-2.0"

[dependencies]
anyhow = "1.0"
crossbeam = "0.8"
flate2 = "1.0.22"
futures = "0.3.21"
hex = "0.4.3"
indicatif = { version = "0.16.2", features = ["rayon"] }
Expand All @@ -32,7 +31,3 @@ walkdir = "2.3"
[[bin]]
name = "omicron-package"
doc = false

[[bin]]
name = "thing-flinger"
doc = false
5 changes: 1 addition & 4 deletions sled-agent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
name = "omicron-sled-agent"
description = "Services for managing sled-local resources"
version = "0.1.0"
edition = "2021"
license = "MPL-2.0"
Expand Down Expand Up @@ -67,7 +68,3 @@ doc = false
[[bin]]
name = "sled-agent"
doc = false

[[bin]]
name = "sled-agent-overlay-files"
doc = false