nixosTests.ceph-single-node: handleTest -> runTest
This commit is contained in:
parent
50f3960dc8
commit
9206b0adec
@ -296,7 +296,7 @@ in
|
||||
};
|
||||
centrifugo = runTest ./centrifugo.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 = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix;
|
||||
ceph-single-node-bluestore = handleTestOn [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
|
@ -1,5 +1,4 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
{ lib, ... }:
|
||||
|
||||
let
|
||||
cfg = {
|
||||
@ -38,11 +37,10 @@ import ./make-test-python.nix (
|
||||
|
||||
generateHost =
|
||||
{
|
||||
pkgs,
|
||||
cephConfig,
|
||||
networkConfig,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation = {
|
||||
emptyDiskImages = [
|
||||
@ -69,7 +67,7 @@ import ./make-test-python.nix (
|
||||
|
||||
networkMonA = {
|
||||
dhcpcd.enable = false;
|
||||
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
|
||||
interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
|
||||
{
|
||||
address = cfg.monA.ip;
|
||||
prefixLength = 24;
|
||||
@ -101,9 +99,7 @@ import ./make-test-python.nix (
|
||||
# https://docs.ceph.com/docs/master/install/manual-deployment/
|
||||
# For other ways to deploy a ceph cluster, look at the documentation at
|
||||
# https://docs.ceph.com/docs/master/
|
||||
testscript =
|
||||
{ ... }:
|
||||
''
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
monA.wait_for_unit("network.target")
|
||||
@ -230,7 +226,7 @@ import ./make-test-python.nix (
|
||||
in
|
||||
{
|
||||
name = "basic-single-node-ceph-cluster";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [
|
||||
lejonet
|
||||
johanot
|
||||
@ -239,12 +235,10 @@ import ./make-test-python.nix (
|
||||
|
||||
nodes = {
|
||||
monA = generateHost {
|
||||
pkgs = pkgs;
|
||||
cephConfig = cephConfigMonA;
|
||||
networkConfig = networkMonA;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = testscript;
|
||||
inherit testScript;
|
||||
}
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user