nixos/tests/kanidm: restore eval when calling nixosTests.kanidm
directly
instead of `kanidm.passthru.tests` by leveraging `runTest { }.extend` and `_module.args.<name> = lib.mkDefault <thing>`.
This commit is contained in:
parent
ce6168bd6d
commit
01c15b8752
@ -772,18 +772,8 @@ in
|
||||
k3s = handleTest ./k3s { };
|
||||
kafka = handleTest ./kafka { };
|
||||
kanboard = runTest ./web-apps/kanboard.nix;
|
||||
kanidm =
|
||||
kanidmVersion:
|
||||
runTest {
|
||||
imports = [ ./kanidm.nix ];
|
||||
_module.args = { inherit kanidmVersion; };
|
||||
};
|
||||
kanidm-provisioning =
|
||||
kanidmVersion:
|
||||
runTest {
|
||||
imports = [ ./kanidm-provisioning.nix ];
|
||||
_module.args = { inherit kanidmVersion; };
|
||||
};
|
||||
kanidm = runTest ./kanidm.nix;
|
||||
kanidm-provisioning = runTest ./kanidm-provisioning.nix;
|
||||
karma = runTest ./karma.nix;
|
||||
kavita = runTest ./kavita.nix;
|
||||
kbd-setfont-decompress = runTest ./kbd-setfont-decompress.nix;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ kanidmVersion, pkgs, ... }:
|
||||
{ kanidmPackage, pkgs, ... }:
|
||||
let
|
||||
certs = import ./common/acme/server/snakeoil-certs.nix;
|
||||
serverDomain = certs.domain;
|
||||
@ -13,13 +13,13 @@ let
|
||||
provisionAdminPassword = "very-strong-password-for-admin";
|
||||
provisionIdmAdminPassword = "very-strong-password-for-idm-admin";
|
||||
provisionIdmAdminPassword2 = "very-strong-alternative-password-for-idm-admin";
|
||||
|
||||
kanidmPackage = pkgs."kanidmWithSecretProvisioning_${kanidmVersion}";
|
||||
in
|
||||
{
|
||||
name = "kanidm-provisioning";
|
||||
name = "kanidm-provisioning-${kanidmPackage.version}";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
|
||||
|
||||
_module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning;
|
||||
|
||||
nodes.provision =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ kanidmVersion, pkgs, ... }:
|
||||
{ kanidmPackage, pkgs, ... }:
|
||||
let
|
||||
certs = import ./common/acme/server/snakeoil-certs.nix;
|
||||
serverDomain = certs.domain;
|
||||
@ -13,16 +13,16 @@ let
|
||||
cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
|
||||
cp ${certs."${serverDomain}".key} $out/snakeoil.key
|
||||
'';
|
||||
|
||||
kanidmPackage = pkgs."kanidm_${kanidmVersion}";
|
||||
in
|
||||
{
|
||||
name = "kanidm";
|
||||
name = "kanidm-${kanidmPackage.version}";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [
|
||||
Flakebi
|
||||
oddlama
|
||||
];
|
||||
|
||||
_module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm;
|
||||
|
||||
nodes.server =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
@ -133,8 +133,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
kanidm = nixosTests.kanidm (versionUnderscored finalAttrs);
|
||||
kanidm-provisioning = nixosTests.kanidm-provisioning (versionUnderscored finalAttrs);
|
||||
kanidm = nixosTests.kanidm.extend {
|
||||
modules = [ { _module.args.kanidmPackage = finalAttrs.finalPackage; } ];
|
||||
};
|
||||
kanidm-provisioning = nixosTests.kanidm-provisioning.extend {
|
||||
modules = [ { _module.args.kanidmPackage = finalAttrs.finalPackage.withSecretProvisioning; } ];
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = lib.optionals (!enableSecretProvisioning) (nix-update-script {
|
||||
|
Loading…
x
Reference in New Issue
Block a user