mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #276816 from majiru/nixos-tests-build-discrepancy
Nixos tests build discrepancy
This commit is contained in:
commit
ca0de94ebb
|
@ -464,7 +464,7 @@ in {
|
||||||
keymap = handleTest ./keymap.nix {};
|
keymap = handleTest ./keymap.nix {};
|
||||||
knot = handleTest ./knot.nix {};
|
knot = handleTest ./knot.nix {};
|
||||||
komga = handleTest ./komga.nix {};
|
komga = handleTest ./komga.nix {};
|
||||||
krb5 = discoverTests (import ./krb5 {});
|
krb5 = discoverTests (import ./krb5);
|
||||||
ksm = handleTest ./ksm.nix {};
|
ksm = handleTest ./ksm.nix {};
|
||||||
kthxbye = handleTest ./kthxbye.nix {};
|
kthxbye = handleTest ./kthxbye.nix {};
|
||||||
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
|
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
|
||||||
|
|
|
@ -40,4 +40,4 @@ let
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
builtins.mapAttrs (k: v: mkTest k v { }) tests
|
builtins.mapAttrs (k: v: mkTest k v) tests
|
||||||
|
|
|
@ -6,8 +6,8 @@ let
|
||||||
certs = import ./common/acme/server/snakeoil-certs.nix;
|
certs = import ./common/acme/server/snakeoil-certs.nix;
|
||||||
frontendUrl = "https://${certs.domain}";
|
frontendUrl = "https://${certs.domain}";
|
||||||
|
|
||||||
keycloakTest = import ./make-test-python.nix (
|
keycloakTest = databaseType: import ./make-test-python.nix (
|
||||||
{ pkgs, databaseType, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
|
initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
|
||||||
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
|
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
|
||||||
|
@ -76,16 +76,18 @@ let
|
||||||
enabled = true;
|
enabled = true;
|
||||||
realm = "test-realm";
|
realm = "test-realm";
|
||||||
clients = [ client ];
|
clients = [ client ];
|
||||||
users = [(
|
users = [
|
||||||
user // {
|
(
|
||||||
enabled = true;
|
user // {
|
||||||
credentials = [{
|
enabled = true;
|
||||||
type = "password";
|
credentials = [{
|
||||||
temporary = false;
|
type = "password";
|
||||||
value = password;
|
temporary = false;
|
||||||
}];
|
value = password;
|
||||||
}
|
}];
|
||||||
)];
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
|
realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
|
||||||
|
@ -177,7 +179,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
postgres = keycloakTest { databaseType = "postgresql"; };
|
postgres = keycloakTest "postgresql";
|
||||||
mariadb = keycloakTest { databaseType = "mariadb"; };
|
mariadb = keycloakTest "mariadb";
|
||||||
mysql = keycloakTest { databaseType = "mysql"; };
|
mysql = keycloakTest "mysql";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
{ system ? builtins.currentSystem }:
|
|
||||||
{
|
{
|
||||||
example-config = import ./example-config.nix { inherit system; };
|
example-config = import ./example-config.nix;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
f: {
|
f: {
|
||||||
system ? builtins.currentSystem,
|
system,
|
||||||
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
|
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
|
||||||
...
|
...
|
||||||
} @ args:
|
} @ args:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
let
|
let
|
||||||
opensearchTest =
|
opensearchTest = extraSettings:
|
||||||
import ./make-test-python.nix (
|
import ./make-test-python.nix (
|
||||||
{ pkgs, lib, extraSettings ? {} }: {
|
{ pkgs, lib, ... }: {
|
||||||
name = "opensearch";
|
name = "opensearch";
|
||||||
meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
|
meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
|
||||||
|
|
||||||
|
@ -27,20 +27,18 @@ in
|
||||||
{
|
{
|
||||||
opensearch = opensearchTest {};
|
opensearch = opensearchTest {};
|
||||||
opensearchCustomPathAndUser = opensearchTest {
|
opensearchCustomPathAndUser = opensearchTest {
|
||||||
extraSettings = {
|
services.opensearch.dataDir = "/var/opensearch_test";
|
||||||
services.opensearch.dataDir = "/var/opensearch_test";
|
services.opensearch.user = "open_search";
|
||||||
services.opensearch.user = "open_search";
|
services.opensearch.group = "open_search";
|
||||||
services.opensearch.group = "open_search";
|
systemd.tmpfiles.rules = [
|
||||||
systemd.tmpfiles.rules = [
|
"d /var/opensearch_test 0700 open_search open_search -"
|
||||||
"d /var/opensearch_test 0700 open_search open_search -"
|
];
|
||||||
];
|
users = {
|
||||||
users = {
|
groups.open_search = { };
|
||||||
groups.open_search = {};
|
users.open_search = {
|
||||||
users.open_search = {
|
description = "OpenSearch daemon user";
|
||||||
description = "OpenSearch daemon user";
|
group = "open_search";
|
||||||
group = "open_search";
|
isSystemUser = true;
|
||||||
isSystemUser = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,4 +76,4 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
in
|
in
|
||||||
builtins.mapAttrs (k: v: mkTest k v { }) tests
|
builtins.mapAttrs (k: v: mkTest k v) tests
|
||||||
|
|
Loading…
Reference in a new issue