Allow tests to use extraParams
This commit is contained in:
parent
34e25ec3f4
commit
7b46303479
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -6,7 +6,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
processesEnvSystem = import ../build-disnix-env.nix ({
|
processesEnvSystem = import ../build-disnix-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
disnixDataDir = "${pkgs.disnix}/share/disnix";
|
disnixDataDir = "${pkgs.disnix}/share/disnix";
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
|
|
||||||
processesEnvSystem = import ../build-docker-env.nix ({
|
processesEnvSystem = import ../build-docker-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
|
|
||||||
processesEnvSystem = import ../build-s6-rc-env.nix ({
|
processesEnvSystem = import ../build-s6-rc-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
|
|
||||||
processesEnvSystem = import ../build-supervisord-env.nix ({
|
processesEnvSystem = import ../build-supervisord-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -6,7 +6,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
processesEnvSystem = import ../build-systemd-env.nix ({
|
processesEnvSystem = import ../build-systemd-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
|
|
||||||
deployEnv = if profileSettings.params.forceDisableUserChange
|
deployEnv = if profileSettings.params.forceDisableUserChange
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{profileSettings, exprFile, tools, pkgs, system}:
|
{profileSettings, exprFile, extraParams, tools, pkgs, system}:
|
||||||
|
|
||||||
let
|
let
|
||||||
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
|
||||||
|
@ -6,7 +6,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
processesEnvSystem = import ../build-sysvinit-env.nix ({
|
processesEnvSystem = import ../build-sysvinit-env.nix ({
|
||||||
inherit pkgs system exprFile;
|
inherit pkgs system exprFile extraParams;
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,17 +11,17 @@ let
|
||||||
inherit pkgs system;
|
inherit pkgs system;
|
||||||
};
|
};
|
||||||
|
|
||||||
testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness, tests}:
|
testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, extraParams ? {}, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness, tests}:
|
||||||
let
|
let
|
||||||
processManagerModule = builtins.getAttr processManager processManagerModules;
|
processManagerModule = builtins.getAttr processManager processManagerModules;
|
||||||
|
|
||||||
processManagerSettings = import processManagerModule {
|
processManagerSettings = import processManagerModule {
|
||||||
inherit profileSettings exprFile pkgs system tools;
|
inherit profileSettings exprFile extraParams pkgs system tools;
|
||||||
};
|
};
|
||||||
|
|
||||||
processes = import exprFile ({
|
processes = import exprFile ({
|
||||||
inherit pkgs system processManager;
|
inherit pkgs system processManager;
|
||||||
} // profileSettings.params);
|
} // extraParams // profileSettings.params);
|
||||||
in
|
in
|
||||||
with import "${nixpkgs}/nixos/lib/testing-python.nix" { inherit system; };
|
with import "${nixpkgs}/nixos/lib/testing-python.nix" { inherit system; };
|
||||||
|
|
||||||
|
@ -77,6 +77,7 @@ in
|
||||||
{ processManagers
|
{ processManagers
|
||||||
, profiles
|
, profiles
|
||||||
, exprFile
|
, exprFile
|
||||||
|
, extraParams ? {}
|
||||||
, nixosConfig ? null
|
, nixosConfig ? null
|
||||||
, systemPackages ? []
|
, systemPackages ? []
|
||||||
, initialTests ? null
|
, initialTests ? null
|
||||||
|
@ -91,7 +92,7 @@ pkgs.lib.genAttrs profiles (profile:
|
||||||
in
|
in
|
||||||
pkgs.lib.genAttrs processManagers (processManager:
|
pkgs.lib.genAttrs processManagers (processManager:
|
||||||
testSystemVariantForProcessManager {
|
testSystemVariantForProcessManager {
|
||||||
inherit processManager profileSettings exprFile nixosConfig systemPackages initialTests readiness tests;
|
inherit processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests;
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue