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

nixosTests.ceph-multi-node: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 19:06:37 +08:00
parent f4a714d8d5
commit 50f3960dc8
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 269 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ in
_module.args.getPackage = pkgs: pkgs.cassandra; _module.args.getPackage = pkgs: pkgs.cassandra;
}; };
centrifugo = runTest ./centrifugo.nix; centrifugo = runTest ./centrifugo.nix;
ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { }; ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix;
ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix { }; ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix { };
ceph-single-node-bluestore = handleTestOn [ ceph-single-node-bluestore = handleTestOn [
"aarch64-linux" "aarch64-linux"

31
nixos/tests/ceph-multi-node.nix
View File

@ -1,7 +1,5 @@
import ./make-test-python.nix ( { lib, ... }:
{ pkgs, lib, ... }: let
let
cfg = { cfg = {
clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03"; clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03";
monA = { monA = {
@ -40,12 +38,8 @@ import ./make-test-python.nix (
// daemonConfig; // daemonConfig;
generateHost = generateHost =
{ { cephConfig, networkConfig }:
pkgs, { pkgs, ... }:
cephConfig,
networkConfig,
...
}:
{ {
virtualisation = { virtualisation = {
emptyDiskImages = [ 20480 ]; emptyDiskImages = [ 20480 ];
@ -69,7 +63,7 @@ import ./make-test-python.nix (
networkMonA = { networkMonA = {
dhcpcd.enable = false; dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
{ {
address = cfg.monA.ip; address = cfg.monA.ip;
prefixLength = 24; prefixLength = 24;
@ -103,7 +97,7 @@ import ./make-test-python.nix (
networkOsd = osd: { networkOsd = osd: {
dhcpcd.enable = false; dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
{ {
address = osd.ip; address = osd.ip;
prefixLength = 24; prefixLength = 24;
@ -262,36 +256,31 @@ import ./make-test-python.nix (
monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
''; '';
in in
{ {
name = "basic-multi-node-ceph-cluster"; name = "basic-multi-node-ceph-cluster";
meta = with pkgs.lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ lejonet ]; maintainers = [ lejonet ];
}; };
nodes = { nodes = {
monA = generateHost { monA = generateHost {
pkgs = pkgs;
cephConfig = cephConfigMonA; cephConfig = cephConfigMonA;
networkConfig = networkMonA; networkConfig = networkMonA;
}; };
osd0 = generateHost { osd0 = generateHost {
pkgs = pkgs;
cephConfig = cephConfigOsd cfg.osd0; cephConfig = cephConfigOsd cfg.osd0;
networkConfig = networkOsd cfg.osd0; networkConfig = networkOsd cfg.osd0;
}; };
osd1 = generateHost { osd1 = generateHost {
pkgs = pkgs;
cephConfig = cephConfigOsd cfg.osd1; cephConfig = cephConfigOsd cfg.osd1;
networkConfig = networkOsd cfg.osd1; networkConfig = networkOsd cfg.osd1;
}; };
osd2 = generateHost { osd2 = generateHost {
pkgs = pkgs;
cephConfig = cephConfigOsd cfg.osd2; cephConfig = cephConfigOsd cfg.osd2;
networkConfig = networkOsd cfg.osd2; networkConfig = networkOsd cfg.osd2;
}; };
}; };
testScript = testscript; testScript = testscript;
} }
)