Merge branch 'affinity-db-model' into affinity-db-crud

.config/nextest.toml

@@ -3,7 +3,7 @@
 #
 # The required version should be bumped up if we need new features, performance
 # improvements or bugfixes that are present in newer versions of nextest.
-nextest-version = { required = "0.9.77", recommended = "0.9.86" }
+nextest-version = { required = "0.9.91", recommended = "0.9.91" }
 
 experimental = ["setup-scripts"]
 
@@ -48,9 +48,18 @@ 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.

.github/buildomat/build-and-test.sh

@@ -18,7 +18,7 @@ target_os=$1
 # NOTE: This version should be in sync with the recommended version in
 # .config/nextest.toml. (Maybe build an automated way to pull the recommended
 # version in the future.)
-NEXTEST_VERSION='0.9.86'
+NEXTEST_VERSION='0.9.91'
 
 cargo --version
 rustc --version