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

nixosTests.cockroachdb: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 20:40:14 +08:00
parent 9b445d3596
commit 9a02037834
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,7 +329,7 @@ in
]; ];
}; };
cockpit = runTest ./cockpit.nix; cockpit = runTest ./cockpit.nix;
cockroachdb = handleTestOn [ "x86_64-linux" ] ./cockroachdb.nix { }; cockroachdb = runTestOn [ "x86_64-linux" ] ./cockroachdb.nix;
code-server = runTest ./code-server.nix; code-server = runTest ./code-server.nix;
coder = runTest ./coder.nix; coder = runTest ./coder.nix;
collectd = runTest ./collectd.nix; collectd = runTest ./collectd.nix;

52
nixos/tests/cockroachdb.nix
View File

@ -45,8 +45,9 @@
# requirements, but would probably allow both aarch64/x86_64 to work. # requirements, but would probably allow both aarch64/x86_64 to work.
# #
let { lib, ... }:
let
# Creates a node. If 'joinNode' parameter, a string containing an IP address, # Creates a node. If 'joinNode' parameter, a string containing an IP address,
# is non-null, then the CockroachDB server will attempt to join/connect to # is non-null, then the CockroachDB server will attempt to join/connect to
# the cluster node specified at that address. # the cluster node specified at that address.
@ -59,7 +60,6 @@ let
config, config,
... ...
}: }:
{ {
# Bank/TPC-C benchmarks take some memory to complete # Bank/TPC-C benchmarks take some memory to complete
virtualisation.memorySize = 2048; virtualisation.memorySize = 2048;
@ -103,32 +103,28 @@ let
${pkgs.chrony}/bin/chronyc waitsync ${pkgs.chrony}/bin/chronyc waitsync
''; '';
}; };
in in
import ./make-test-python.nix ( {
{ pkgs, ... }: name = "cockroachdb";
{ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
name = "cockroachdb";
meta.maintainers = with pkgs.lib.maintainers; [ thoughtpolice ];
nodes = { nodes = {
node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null; node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null;
node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1"; node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1"; node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1";
}; };
# NOTE: All the nodes must start in order and you must NOT use startAll, because # NOTE: All the nodes must start in order and you must NOT use startAll, because
# there's otherwise no way to guarantee that node1 will start before the others try # there's otherwise no way to guarantee that node1 will start before the others try
# to join it. # to join it.
testScript = '' testScript = ''
for node in node1, node2, node3: for node in node1, node2, node3:
node.start() node.start()
node.wait_for_unit("cockroachdb") node.wait_for_unit("cockroachdb")
node1.succeed( node1.succeed(
"cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1", "cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1",
"cockroach workload init bank 'postgresql://root@192.168.1.1:26257?sslmode=disable'", "cockroach workload init bank 'postgresql://root@192.168.1.1:26257?sslmode=disable'",
"cockroach workload run bank --duration=1m 'postgresql://root@192.168.1.1:26257?sslmode=disable'", "cockroach workload run bank --duration=1m 'postgresql://root@192.168.1.1:26257?sslmode=disable'",
) )
''; '';
} }
)