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

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

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

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

@ -297,10 +297,10 @@ in
centrifugo = runTest ./centrifugo.nix; centrifugo = runTest ./centrifugo.nix;
ceph-multi-node = runTestOn [ "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 = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix; ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix;
ceph-single-node-bluestore = handleTestOn [ ceph-single-node-bluestore = runTestOn [
"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 = handleTestOn [
"aarch64-linux" "aarch64-linux"
"x86_64-linux" "x86_64-linux"

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

@ -1,5 +1,4 @@
import ./make-test-python.nix ( { lib, ... }:
{ pkgs, lib, ... }:
let let
cfg = { cfg = {
@ -38,11 +37,10 @@ import ./make-test-python.nix (
generateHost = generateHost =
{ {
pkgs,
cephConfig, cephConfig,
networkConfig, networkConfig,
...
}: }:
{ pkgs, ... }:
{ {
virtualisation = { virtualisation = {
emptyDiskImages = [ emptyDiskImages = [
@ -69,7 +67,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;
@ -101,9 +99,7 @@ import ./make-test-python.nix (
# https://docs.ceph.com/docs/master/install/manual-deployment/ # https://docs.ceph.com/docs/master/install/manual-deployment/
# For other ways to deploy a ceph cluster, look at the documentation at # For other ways to deploy a ceph cluster, look at the documentation at
# https://docs.ceph.com/docs/master/ # https://docs.ceph.com/docs/master/
testscript = testScript = ''
{ ... }:
''
start_all() start_all()
monA.wait_for_unit("network.target") monA.wait_for_unit("network.target")
@ -219,18 +215,16 @@ import ./make-test-python.nix (
in in
{ {
name = "basic-single-node-ceph-cluster-bluestore"; name = "basic-single-node-ceph-cluster-bluestore";
meta = with pkgs.lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ lukegb ]; maintainers = [ lukegb ];
}; };
nodes = { nodes = {
monA = generateHost { monA = generateHost {
pkgs = pkgs;
cephConfig = cephConfigMonA; cephConfig = cephConfigMonA;
networkConfig = networkMonA; networkConfig = networkMonA;
}; };
}; };
testScript = testscript; inherit testScript;
} }
)