Merge branch 'main' into single-node-clickhouse-init

oxidecomputer · Nov 14, 2024 · f99682e · f99682e
2 parents 97d4c2c + 41b78f1
commit f99682e
Show file tree

Hide file tree

Showing 160 changed files with 13,639 additions and 3,223 deletions.
diff --git a/.config/nextest.toml b/.config/nextest.toml
@@ -23,6 +23,13 @@ fail-fast = false
 # invocations of nextest happen.
 command = 'cargo run -p crdb-seed --profile test'
 
+[[profile.default.scripts]]
+filter = 'package(omicron-clickhouse-admin)'
+setup = 'clickhouse-cluster'
+
+[script.clickhouse-cluster]
+command = 'cargo run -p clickhouse-cluster-dev'
+
 [test-groups]
 # The ClickHouse cluster tests currently rely on a hard-coded set of ports for
 # the nodes in the cluster. We would like to relax this in the future, at which
@@ -39,7 +46,7 @@ live-tests = { max-threads = 1 }
 default-filter = 'all() - package(omicron-live-tests) - package(end-to-end-tests)'
 
 [[profile.default.overrides]]
-filter = 'package(oximeter-db) and test(replicated)'
+filter = 'package(oximeter-db) and test(replicated) + package(omicron-clickhouse-admin)'
 test-group = 'clickhouse-cluster'
 
 [[profile.default.overrides]]