nixos/tests: respect meta.hydraPlatforms (#503721)
This commit is contained in:
+22
-12
@@ -43,12 +43,17 @@ let
|
||||
pkgs = import ./.. { inherit system; };
|
||||
callTest =
|
||||
config:
|
||||
if attrNamesOnly then
|
||||
hydraJob config.test
|
||||
else
|
||||
{
|
||||
${system} = hydraJob config.test;
|
||||
};
|
||||
let
|
||||
inherit (config) test;
|
||||
in
|
||||
lib.optionalAttrs (builtins.elem system (getPlatforms test)) (
|
||||
if attrNamesOnly then
|
||||
hydraJob test
|
||||
else
|
||||
{
|
||||
${system} = hydraJob test;
|
||||
}
|
||||
);
|
||||
}
|
||||
// {
|
||||
# for typechecking of the scripts and evaluation of
|
||||
@@ -58,12 +63,17 @@ let
|
||||
pkgs = import ./.. { inherit system; };
|
||||
callTest =
|
||||
config:
|
||||
if attrNamesOnly then
|
||||
hydraJob config.test
|
||||
else
|
||||
{
|
||||
${system} = hydraJob config.driver;
|
||||
};
|
||||
let
|
||||
inherit (config) driver;
|
||||
in
|
||||
lib.optionalAttrs (builtins.elem system (getPlatforms driver)) (
|
||||
if attrNamesOnly then
|
||||
hydraJob driver
|
||||
else
|
||||
{
|
||||
${system} = hydraJob driver;
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
{
|
||||
name = "containers";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ jfly ];
|
||||
# https://github.com/NixOS/infra/issues/987
|
||||
meta.hydraPlatforms = [ ];
|
||||
|
||||
nodes = {
|
||||
n1 = {
|
||||
|
||||
@@ -51,6 +51,8 @@ in
|
||||
maintainers = [
|
||||
lib.maintainers.kmein
|
||||
];
|
||||
# https://github.com/NixOS/infra/issues/987
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
containers = {
|
||||
|
||||
Reference in New Issue
Block a user