kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

update data model tests to account for changes

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-11-24 18:10:39 +01:00
parent 09e8b0141a
commit 6281ee8305
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deployment/check/data-model-basic/nixosTest.nix
View file

@ -19,13 +19,13 @@ in
imports = [ ../common/model.nix ];
options = {
default = mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
configuration = config."example-configuration";
};
};
deploy = mkOption {
default = config.default.ssh-host.run;
default = config.default.deployments.nixos-configuration;
};
};
config = {
@ -34,7 +34,7 @@ in
implementation =
{ required-resources, ... }:
{
nixos-configuration = {
deployments.nixos-configuration = {
imports = [
(mkNixosConfiguration environment required-resources)
"${modulesPath}/../lib/testing/nixos-test-base.nix"
@ -44,7 +44,7 @@ in
};
};
}
)).default.nixos-configuration;
)).deploy;
extraTestScript = ''
with subtest("Check the data model"):

4
deployment/check/data-model-nixops4/data-model.nix
View file

@ -30,7 +30,7 @@ in
...
}:
{
nixops4 =
deployments.nixops4 =
{ providers, ... }:
{
providers = {
@ -56,7 +56,7 @@ in
};
};
options.default = lib.mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
configuration = config."example-configuration";
};

2
deployment/check/data-model-nixops4/flake-under-test.nix
View file

@ -23,7 +23,7 @@
inherit (import ./deployment/check/data-model-nixops4/constants.nix) pathToRoot pathFromRoot;
nodeName = "nixops4";
};
}).default.nixops4;
}).default.deployments.nixops4;
}
);
}

6
deployment/check/data-model-ssh/data-model.nix
View file

@ -32,7 +32,7 @@ in
...
}:
{
ssh-host = {
deployments.ssh-host = {
nixos-configuration = {
imports = [
(mkNixosConfiguration environment required-resources)
@ -55,13 +55,13 @@ in
};
options = {
default = mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
configuration = config."example-configuration";
};
};
deploy = mkOption {
default = config.default.ssh-host.run;
default = config.default.deployments.ssh-host.run;
};
};
}

6
deployment/check/data-model-tf-proxmox/setups/template.nix
View file

@ -35,7 +35,7 @@ in
...
}:
{
tf-proxmox-template = {
deployments.tf-proxmox-template = {
nixos-configuration = {
imports = [
(mkNixosConfiguration environment required-resources)
@ -57,14 +57,14 @@ in
};
options = {
default = mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
# normally our template is distinct, but our test cannot download build deps due to sandboxing
configuration = config."example-configuration";
};
};
deploy = mkOption {
default = config.default.tf-proxmox-template.run;
default = config.default.deployments.tf-proxmox-template.run;
};
};
}

6
deployment/check/data-model-tf-proxmox/setups/vm.nix
View file

@ -47,7 +47,7 @@ in
deployment-name,
}:
{
tf-proxmox-vm = {
deployments.tf-proxmox-vm = {
nixos-configuration = {
imports = [
(mkNixosConfiguration environment required-resources)
@ -84,13 +84,13 @@ in
};
options = {
default = mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
configuration = config."example-configuration";
};
};
deploy = mkOption {
default = config.default.tf-proxmox-vm.run;
default = config.default.deployments.tf-proxmox-vm.run;
};
};
}

6
deployment/check/data-model-tf/data-model.nix
View file

@ -32,7 +32,7 @@ in
deployment-name,
}:
{
tf-host = {
deployments.tf-host = {
nixos-configuration = {
imports = [
(mkNixosConfiguration environment required-resources)
@ -55,13 +55,13 @@ in
};
options = {
default = mkOption {
type = config.deployment-type;
type = config.env-output;
default = config.environments.default.deployment {
configuration = config."example-configuration";
};
};
deploy = mkOption {
default = config.default.tf-host.run;
default = config.default.deployments.tf-host.run;
};
};
}