Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nixos tests build discrepancy #276816

Merged
merged 2 commits into from Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/tests/all-tests.nix
Expand Up @@ -464,7 +464,7 @@ in {
keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {};
komga = handleTest ./komga.nix {};
krb5 = discoverTests (import ./krb5 {});
krb5 = discoverTests (import ./krb5);
ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/freetube.nix
Expand Up @@ -40,4 +40,4 @@ let
'';
});
in
builtins.mapAttrs (k: v: mkTest k v { }) tests
builtins.mapAttrs (k: v: mkTest k v) tests
32 changes: 17 additions & 15 deletions nixos/tests/keycloak.nix
Expand Up @@ -6,8 +6,8 @@ let
certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}";

keycloakTest = import ./make-test-python.nix (
{ pkgs, databaseType, ... }:
keycloakTest = databaseType: import ./make-test-python.nix (
{ pkgs, ... }:
let
initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
Expand Down Expand Up @@ -76,16 +76,18 @@ let
enabled = true;
realm = "test-realm";
clients = [ client ];
users = [(
user // {
enabled = true;
credentials = [{
type = "password";
temporary = false;
value = password;
}];
}
)];
users = [
(
user // {
enabled = true;
credentials = [{
type = "password";
temporary = false;
value = password;
}];
}
)
];
};

realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
Expand Down Expand Up @@ -177,7 +179,7 @@ let
);
in
{
postgres = keycloakTest { databaseType = "postgresql"; };
mariadb = keycloakTest { databaseType = "mariadb"; };
mysql = keycloakTest { databaseType = "mysql"; };
postgres = keycloakTest "postgresql";
mariadb = keycloakTest "mariadb";
mysql = keycloakTest "mysql";
}
3 changes: 1 addition & 2 deletions nixos/tests/krb5/default.nix
@@ -1,4 +1,3 @@
{ system ? builtins.currentSystem }:
{
example-config = import ./example-config.nix { inherit system; };
example-config = import ./example-config.nix;
}
2 changes: 1 addition & 1 deletion nixos/tests/make-test-python.nix
@@ -1,5 +1,5 @@
f: {
system ? builtins.currentSystem,
system,
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
...
} @ args:
Expand Down
30 changes: 14 additions & 16 deletions nixos/tests/opensearch.nix
@@ -1,7 +1,7 @@
let
opensearchTest =
opensearchTest = extraSettings:
import ./make-test-python.nix (
{ pkgs, lib, extraSettings ? {} }: {
{ pkgs, lib, ... }: {
name = "opensearch";
meta.maintainers = with pkgs.lib.maintainers; [ shyim ];

Expand All @@ -27,20 +27,18 @@ in
{
opensearch = opensearchTest {};
opensearchCustomPathAndUser = opensearchTest {
extraSettings = {
services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.user = "open_search";
services.opensearch.group = "open_search";
systemd.tmpfiles.rules = [
"d /var/opensearch_test 0700 open_search open_search -"
];
users = {
groups.open_search = {};
users.open_search = {
description = "OpenSearch daemon user";
group = "open_search";
isSystemUser = true;
};
services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.user = "open_search";
services.opensearch.group = "open_search";
systemd.tmpfiles.rules = [
"d /var/opensearch_test 0700 open_search open_search -"
];
users = {
groups.open_search = { };
users.open_search = {
description = "OpenSearch daemon user";
group = "open_search";
isSystemUser = true;
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/vscodium.nix
Expand Up @@ -76,4 +76,4 @@ let
});

in
builtins.mapAttrs (k: v: mkTest k v { }) tests
builtins.mapAttrs (k: v: mkTest k v) tests