Merge branch 'support-bundles-crdb' into support-bundle-simulated-imp…

…lementation
oxidecomputer · Jan 8, 2025 · 69e0f46 · 69e0f46
2 parents 8b58c16 + 7c1457f
commit 69e0f46
Show file tree

Hide file tree

Showing 79 changed files with 4,954 additions and 3,503 deletions.
diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh
@@ -28,7 +28,7 @@ ptime -m cargo xtask download softnpu
 # Build the test target
 export CARGO_INCREMENTAL=0
 ptime -m cargo run --locked --release --bin omicron-package -- \
-  -t test target create -i standard -m non-gimlet -s softnpu -r single-sled
+  -t test target create -p dev
 ptime -m cargo run --locked --release --bin omicron-package -- \
   -t test package
 mapfile -t packages \

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Install Pre-Requisites
       run: ./tools/install_builder_prerequisites.sh -y
     - name: Set default target
-      run: cargo run --bin omicron-package -- -t default target create -r single-sled
+      run: cargo run --bin omicron-package -- -t default target create --preset dev
     - name: Check build of deployed Omicron packages
       run: cargo run --bin omicron-package -- -t default check
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -499,7 +499,7 @@ omicron-rpaths = { path = "rpaths" }
 omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
 omicron-workspace-hack = "0.1.0"
-omicron-zone-package = "0.11.1"
+omicron-zone-package = "0.12.0"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "b56afeeb14e0042cbd7bda85b166ed86ee17820e", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }

diff --git a/clients/dpd-client/build.rs b/clients/dpd-client/build.rs
@@ -14,12 +14,16 @@ use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
 use omicron_zone_package::config::Config;
+use omicron_zone_package::config::PackageName;
 use omicron_zone_package::package::PackageSource;
 use quote::quote;
 use std::env;
 use std::fs;
 use std::path::Path;
 
+const DENDRITE_ASIC_PACKAGE: PackageName =
+    PackageName::new_const("dendrite-asic");
+
 fn main() -> Result<()> {
     // Find the current dendrite repo commit from our package manifest.
     let manifest = fs::read_to_string("../../package-manifest.toml")
@@ -31,7 +35,7 @@ fn main() -> Result<()> {
 
     let dendrite = config
         .packages
-        .get("dendrite-asic")
+        .get(&DENDRITE_ASIC_PACKAGE)
         .context("missing dendrite package in ../../package-manifest.toml")?;
 
     let local_path = match &dendrite.source {

diff --git a/common/src/disk.rs b/common/src/disk.rs
@@ -112,9 +112,7 @@ impl DatasetName {
         &self.pool_name
     }
 
-    // TODO(https://github.com/oxidecomputer/omicron/issues/7115): Rename
-    // this to "kind?
-    pub fn dataset(&self) -> &DatasetKind {
+    pub fn kind(&self) -> &DatasetKind {
         &self.kind
     }
 

diff --git a/dev-tools/reconfigurator-cli/Cargo.toml b/dev-tools/reconfigurator-cli/Cargo.toml
@@ -16,7 +16,7 @@ assert_matches.workspace = true
 camino.workspace = true
 chrono.workspace = true
 clap.workspace = true
-dropshot.workspace = true
+colored.workspace = true
 humantime.workspace = true
 indent_write.workspace = true
 internal-dns-types.workspace = true
@@ -32,6 +32,7 @@ pq-sys = "*"
 reedline.workspace = true
 serde_json.workspace = true
 slog-error-chain.workspace = true
+slog-term.workspace = true
 slog.workspace = true
 swrite.workspace = true
 tabled.workspace = true