From 2c597e9df6e3a9d5b7dd830bcf950b15868724f5 Mon Sep 17 00:00:00 2001 From: Rain Date: Mon, 13 Jul 2026 17:18:53 -0700 Subject: [PATCH] [spr] initial version Created using spr 1.3.6-beta.1 --- .config/nextest.toml | 88 +++++++++++++------------ api_identity/Cargo.toml | 1 - nexus/db-macros/Cargo.toml | 1 - oximeter/oximeter-macro-impl/Cargo.toml | 1 - oximeter/oximeter/Cargo.toml | 1 - 5 files changed, 45 insertions(+), 47 deletions(-) diff --git a/.config/nextest.toml b/.config/nextest.toml index b5614db92f1..84fc77ef2e8 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -5,7 +5,30 @@ # improvements or bugfixes that are present in newer versions of nextest. nextest-version = { required = "0.9.131", recommended = "0.9.131" } -experimental = ["benchmarks", "setup-scripts"] +[experimental] +benchmarks = true +setup-scripts = true + +[profile.default] +default-filter = 'all() - package(omicron-live-tests) - package(end-to-end-tests)' + +[[profile.default.overrides]] +# These tests are quite slow and can hold up the run, so run them first. +filter = 'package(oximeter-db) and test(=client::tests::test_replicated) + test(test_action_failure_can_unwind)' +priority = 20 + +[[profile.default.overrides]] +filter = 'package(oximeter-db) and test(replicated) + package(omicron-clickhouse-admin)' +test-group = 'clickhouse-cluster' +# client::tests::test_replicated is part of this filter, but it's matched with +# the higher priority (20) first. The other tests in this group are run after +# that. +priority = 10 + +[[profile.default.overrides]] +# These tests can time out under heavy contention. +filter = 'binary_id(omicron-nexus::test_all) and test(::schema::)' +threads-required = 4 [[profile.default.scripts]] # Exclude omicron-dev tests from crdb-seed as we explicitly want to simulate an @@ -15,6 +38,10 @@ experimental = ["benchmarks", "setup-scripts"] filter = '(rdeps(nexus-test-utils) + package(nexus-db-schema)) - package(omicron-dev) - package(omicron-live-tests)' setup = 'crdb-seed' +[[profile.default.scripts]] +filter = 'package(omicron-clickhouse-admin)' +setup = 'clickhouse-cluster' + [profile.ci] fail-fast = false retries = 2 @@ -26,15 +53,28 @@ path = "junit.xml" # output for analysis, not visualization. flaky-fail-status = "success" +[[profile.ci.overrides]] +# `omicron-test-utils` is included in this block that uses a longer-than-normal +# timeout because under some conditions it waits for CockroachDB to shut down +# gracefully. Note that `omicron-test-utils` depends on `omicron-nexus`, so this +# is redundant, but we do this for future-proofing. +filter = 'binary_id(omicron-nexus::test_all) + rdeps(omicron-test-utils)' +# As of 2023-01-08, the slowest test in test_all takes 196s on a Ryzen 7950X. +# 900s is a good upper limit that adds a comfortable buffer. +slow-timeout = { period = '60s', terminate-after = 15 } + +[profile.live-tests] +default-filter = 'package(omicron-live-tests)' + +[[profile.live-tests.overrides]] +filter = 'package(omicron-live-tests)' +test-group = 'live-tests' + [scripts.setup.crdb-seed] # Use the test profile for this executable since that's how almost all # invocations of nextest happen. command = 'cargo run -p crdb-seed --profile test' -[[profile.default.scripts]] -filter = 'package(omicron-clickhouse-admin)' -setup = 'clickhouse-cluster' - [scripts.setup.clickhouse-cluster] command = 'cargo run -p clickhouse-cluster-dev' @@ -49,41 +89,3 @@ clickhouse-cluster = { max-threads = 1 } # live-tests operate on a more realistic, shared control plane and test # behaviors that conflict with each other. They need to be run serially. live-tests = { max-threads = 1 } - -[profile.default] -default-filter = 'all() - package(omicron-live-tests) - package(end-to-end-tests)' - -[[profile.default.overrides]] -# These tests are quite slow and can hold up the run, so run them first. -filter = 'package(oximeter-db) and test(=client::tests::test_replicated) + test(test_action_failure_can_unwind)' -priority = 20 - -[[profile.default.overrides]] -filter = 'package(oximeter-db) and test(replicated) + package(omicron-clickhouse-admin)' -test-group = 'clickhouse-cluster' -# client::tests::test_replicated is part of this filter, but it's matched with -# the higher priority (20) first. The other tests in this group are run after -# that. -priority = 10 - -[[profile.default.overrides]] -# These tests can time out under heavy contention. -filter = 'binary_id(omicron-nexus::test_all) and test(::schema::)' -threads-required = 4 - -[[profile.ci.overrides]] -# `omicron-test-utils` is included in this block that uses a longer-than-normal -# timeout because under some conditions it waits for CockroachDB to shut down -# gracefully. Note that `omicron-test-utils` depends on `omicron-nexus`, so this -# is redundant, but we do this for future-proofing. -filter = 'binary_id(omicron-nexus::test_all) + rdeps(omicron-test-utils)' -# As of 2023-01-08, the slowest test in test_all takes 196s on a Ryzen 7950X. -# 900s is a good upper limit that adds a comfortable buffer. -slow-timeout = { period = '60s', terminate-after = 15 } - -[profile.live-tests] -default-filter = 'package(omicron-live-tests)' - -[[profile.live-tests.overrides]] -filter = 'package(omicron-live-tests)' -test-group = 'live-tests' diff --git a/api_identity/Cargo.toml b/api_identity/Cargo.toml index 832d50d979e..f33f0c70ba3 100644 --- a/api_identity/Cargo.toml +++ b/api_identity/Cargo.toml @@ -2,7 +2,6 @@ name = "api_identity" description = "macro used for Oxide control plane resources with an identity" version = "0.1.0" -authors = ["David Pacheco "] edition.workspace = true repository = "https://github.com/oxidecomputer/omicron/" license = "MPL-2.0" diff --git a/nexus/db-macros/Cargo.toml b/nexus/db-macros/Cargo.toml index c03aea99abf..7fb67db690c 100644 --- a/nexus/db-macros/Cargo.toml +++ b/nexus/db-macros/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "db-macros" version = "0.1.0" -authors = ["Sean Klein "] edition.workspace = true license = "MPL-2.0" diff --git a/oximeter/oximeter-macro-impl/Cargo.toml b/oximeter/oximeter-macro-impl/Cargo.toml index 0ee8e4c771e..bc56f177e44 100644 --- a/oximeter/oximeter-macro-impl/Cargo.toml +++ b/oximeter/oximeter-macro-impl/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "oximeter-macro-impl" version = "0.1.0" -authors = ["Benjamin Naecker "] edition.workspace = true license = "MPL-2.0" diff --git a/oximeter/oximeter/Cargo.toml b/oximeter/oximeter/Cargo.toml index 486922024e3..29dda9e2861 100644 --- a/oximeter/oximeter/Cargo.toml +++ b/oximeter/oximeter/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "oximeter" version = "0.1.0" -authors = ["Benjamin Naecker "] edition.workspace = true license = "MPL-2.0"