From d8d39bd436acf52676faaf4803fafa850ba58f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 11 Jun 2026 19:33:32 +0000 Subject: [PATCH] ceph.tests: Rename FileStore tests to *-deprecated-filestore Makes clear that there's not much point contributing new features to those. --- nixos/tests/all-tests.nix | 8 ++++++-- ...-node.nix => ceph-multi-node-deprecated-filestore.nix} | 3 ++- ...node.nix => ceph-single-node-deprecated-filestore.nix} | 2 +- pkgs/by-name/ce/ceph/ceph.nix | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) rename nixos/tests/{ceph-multi-node.nix => ceph-multi-node-deprecated-filestore.nix} (98%) rename nixos/tests/{ceph-single-node.nix => ceph-single-node-deprecated-filestore.nix} (99%) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index db9dd1fb2561..4cb4db7c5e6f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -330,8 +330,8 @@ in }; castopod = runTest ./castopod.nix; centrifugo = runTest ./centrifugo.nix; - ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix; - ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix; + ceph-multi-node-deprecated-filestore = + runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node-deprecated-filestore.nix; ceph-single-node-bluestore = runTestOn [ "aarch64-linux" "x86_64-linux" @@ -340,6 +340,10 @@ in "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore-dmcrypt.nix; + ceph-single-node-deprecated-filestore = runTestOn [ + "aarch64-linux" + "x86_64-linux" + ] ./ceph-single-node-deprecated-filestore.nix; certmgr = import ./certmgr.nix { inherit pkgs runTest; }; cfssl = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix; cgit = runTest ./cgit.nix; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node-deprecated-filestore.nix similarity index 98% rename from nixos/tests/ceph-multi-node.nix rename to nixos/tests/ceph-multi-node-deprecated-filestore.nix index 35e6cb73c1c4..992a74f72972 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node-deprecated-filestore.nix @@ -1,3 +1,4 @@ +# Tests the legacy FileStore OSD backend. { lib, ... }: let cfg = { @@ -262,7 +263,7 @@ let ''; in { - name = "basic-multi-node-ceph-cluster"; + name = "basic-multi-node-ceph-cluster-deprecated-filestore"; meta = with lib.maintainers; { maintainers = [ lejonet ]; }; diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node-deprecated-filestore.nix similarity index 99% rename from nixos/tests/ceph-single-node.nix rename to nixos/tests/ceph-single-node-deprecated-filestore.nix index c7d822230fde..c08238559155 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node-deprecated-filestore.nix @@ -269,7 +269,7 @@ let ''; in { - name = "basic-single-node-ceph-cluster"; + name = "basic-single-node-ceph-cluster-deprecated-filestore"; meta = with lib.maintainers; { maintainers = [ lejonet diff --git a/pkgs/by-name/ce/ceph/ceph.nix b/pkgs/by-name/ce/ceph/ceph.nix index f5f4867a2365..e3744b5cefde 100644 --- a/pkgs/by-name/ce/ceph/ceph.nix +++ b/pkgs/by-name/ce/ceph/ceph.nix @@ -393,10 +393,10 @@ stdenv.mkDerivation { pythonEnv = ceph-python-env; tests = { inherit (nixosTests) - ceph-multi-node - ceph-single-node + ceph-multi-node-deprecated-filestore ceph-single-node-bluestore ceph-single-node-bluestore-dmcrypt + ceph-single-node-deprecated-filestore ; }; };