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

nixosTests.scion-freestanding-deployment: handleTest -> runTest (#423697)

Browse Source
This commit is contained in:
Wolfgang Walther 2025-07-10 06:54:49 +00:00 committed by GitHub
commit c801e4b6a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 194 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1262,7 +1262,7 @@ in
saunafs = runTest ./saunafs.nix; saunafs = runTest ./saunafs.nix;
scaphandre = runTest ./scaphandre.nix; scaphandre = runTest ./scaphandre.nix;
schleuder = runTest ./schleuder.nix; schleuder = runTest ./schleuder.nix;
scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { }; scion-freestanding-deployment = runTest ./scion/freestanding-deployment;
scrutiny = runTest ./scrutiny.nix; scrutiny = runTest ./scrutiny.nix;
scx = runTest ./scx/default.nix; scx = runTest ./scx/default.nix;
sddm = import ./sddm.nix { inherit runTest; }; sddm = import ./sddm.nix { inherit runTest; };

26
nixos/tests/scion/freestanding-deployment/default.nix
View File

@ -1,5 +1,4 @@
# implements https://github.com/scionproto/scion/blob/27983125bccac6b84d1f96f406853aab0e460405/doc/tutorials/deploy.rst # implements https://github.com/scionproto/scion/blob/27983125bccac6b84d1f96f406853aab0e460405/doc/tutorials/deploy.rst
import ../../make-test-python.nix (
{ pkgs, ... }: { pkgs, ... }:
let let
trust-root-configuration-keys = pkgs.runCommand "generate-trc-keys.sh" { trust-root-configuration-keys = pkgs.runCommand "generate-trc-keys.sh" {
@ -9,7 +8,7 @@ import ../../make-test-python.nix (
} (builtins.readFile ./bootstrap.sh); } (builtins.readFile ./bootstrap.sh);
imports = hostId: [ imports = hostId: [
({ {
services.scion = { services.scion = {
enable = true; enable = true;
bypassBootstrapWarning = true; bypassBootstrapWarning = true;
@ -32,30 +31,22 @@ import ../../make-test-python.nix (
environment.systemPackages = [ environment.systemPackages = [
pkgs.scion pkgs.scion
]; ];
}) }
]; ];
in in
{ {
name = "scion-test"; name = "scion-test";
nodes = { nodes = {
scion01 = scion01 = {
{ ... }:
{
imports = (imports 1); imports = (imports 1);
}; };
scion02 = scion02 = {
{ ... }:
{
imports = (imports 2); imports = (imports 2);
}; };
scion03 = scion03 = {
{ ... }:
{
imports = (imports 3); imports = (imports 3);
}; };
scion04 = scion04 = {
{ ... }:
{
imports = (imports 4); imports = (imports 4);
networking.interfaces."lo".ipv4.addresses = [ networking.interfaces."lo".ipv4.addresses = [
{ {
@ -82,9 +73,7 @@ import ../../make-test-python.nix (
}; };
}; };
}; };
scion05 = scion05 = {
{ ... }:
{
imports = (imports 5); imports = (imports 5);
networking.interfaces."lo".ipv4.addresses = [ networking.interfaces."lo".ipv4.addresses = [
{ {
@ -208,4 +197,3 @@ import ../../make-test-python.nix (
succeed("${pingAll} >&2") succeed("${pingAll} >&2")
''; '';
} }
)