talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests.ceph-single-node-bluestore-dmcrypt: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 19:25:34 +08:00
parent 644443d59a
commit 4db8ad5fa6
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 249 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/all-tests.nix
View File

@ -301,10 +301,10 @@ in
"aarch64-linux" "aarch64-linux"
"x86_64-linux" "x86_64-linux"
] ./ceph-single-node-bluestore.nix; ] ./ceph-single-node-bluestore.nix;
ceph-single-node-bluestore-dmcrypt = handleTestOn [ ceph-single-node-bluestore-dmcrypt = runTestOn [
"aarch64-linux" "aarch64-linux"
"x86_64-linux" "x86_64-linux"
] ./ceph-single-node-bluestore-dmcrypt.nix { }; ] ./ceph-single-node-bluestore-dmcrypt.nix;
certmgr = handleTest ./certmgr.nix { }; certmgr = handleTest ./certmgr.nix { };
cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { }; cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { };
cgit = runTest ./cgit.nix; cgit = runTest ./cgit.nix;

32
nixos/tests/ceph-single-node-bluestore-dmcrypt.nix
View File

@ -1,7 +1,6 @@
import ./make-test-python.nix ( { lib, ... }:
{ pkgs, lib, ... }:
let let
# the single node ipv6 address # the single node ipv6 address
ip = "2001:db8:ffff::"; ip = "2001:db8:ffff::";
# the global ceph cluster id # the global ceph cluster id
@ -12,20 +11,21 @@ import ./make-test-python.nix (
"1" = "bd5a6f49-69d5-428c-ac25-a99f0c44375c"; "1" = "bd5a6f49-69d5-428c-ac25-a99f0c44375c";
"2" = "c90de6c7-86c6-41da-9694-e794096dfc5c"; "2" = "c90de6c7-86c6-41da-9694-e794096dfc5c";
}; };
in
in {
{
name = "basic-single-node-ceph-cluster-bluestore-dmcrypt"; name = "basic-single-node-ceph-cluster-bluestore-dmcrypt";
meta = { meta.maintainers = with lib.maintainers; [
maintainers = with lib.maintainers; [
benaryorg benaryorg
nh2 nh2
]; ];
};
nodes = { nodes.ceph =
ceph = {
{ pkgs, config, ... }: lib,
pkgs,
config,
...
}:
{ {
# disks for bluestore # disks for bluestore
virtualisation.emptyDiskImages = [ virtualisation.emptyDiskImages = [
@ -143,11 +143,8 @@ import ./make-test-python.nix (
builtins.listToAttrs builtins.listToAttrs
]; ];
}; };
};
testScript = testScript = ''
{ ... }:
''
start_all() start_all()
ceph.wait_for_unit("default.target") ceph.wait_for_unit("default.target")
@ -269,5 +266,4 @@ import ./make-test-python.nix (
ceph.wait_until_succeeds("ceph -s | grep 'mgr: ceph(active,'") ceph.wait_until_succeeds("ceph -s | grep 'mgr: ceph(active,'")
ceph.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") ceph.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
''; '';
} }
)