mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-15 14:26:33 +01:00
8353ebe073
The existing callSubTests seems to already have special-cased code to allow enabling subtests on a single specific system by looking at the `system` attribute in the test arguments. Replace it with a new version similar to the callTestOnTheseSystems because: - It's consistent with the existing functions for creating system-specific tests (though admittedly, the callSubTests special case for `system` predates them) - This approach allows limiting to multiple system types, the previous one inherently allows only one system type. - This also fixes the problem that if you pass in e.g. supportedSystems = [ "aarch64-linux" ], you end up with a tests.chromium job that silently runs on x86_64-linux. - Finally, this causes renames of the jobs like: tests.chromium -> tests.chromium.x86_64-linux to be consistent with the rest of the tests.
129 lines
4.5 KiB
Nix
129 lines
4.5 KiB
Nix
# This jobset defines the main NixOS channels (such as nixos-unstable
|
||
# and nixos-14.04). The channel is updated every time the ‘tested’ job
|
||
# succeeds, and all other jobs have finished (they may fail).
|
||
|
||
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
|
||
, stableBranch ? false
|
||
, supportedSystems ? [ "x86_64-linux" ]
|
||
, limitedSupportedSystems ? [ "i686-linux" ]
|
||
}:
|
||
|
||
let
|
||
|
||
nixpkgsSrc = nixpkgs; # urgh
|
||
|
||
pkgs = import ./.. {};
|
||
|
||
removeMaintainers = set: if builtins.isAttrs set
|
||
then if (set.type or "") == "derivation"
|
||
then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; }
|
||
else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
|
||
else set;
|
||
|
||
allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
|
||
supportedSystems = supportedSystems ++ limitedSupportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
})) [ "unstable" ];
|
||
|
||
in rec {
|
||
|
||
nixos = removeMaintainers (import ./release.nix {
|
||
inherit stableBranch;
|
||
supportedSystems = supportedSystems ++ limitedSupportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
});
|
||
|
||
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
|
||
inherit supportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
})) [ "unstable" ];
|
||
|
||
tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
|
||
name = "nixos-${nixos.channel.version}";
|
||
meta = {
|
||
description = "Release-critical builds for the NixOS channel";
|
||
maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
|
||
};
|
||
constituents =
|
||
let
|
||
all = x: map (system: x.${system}) supportedSystems;
|
||
in [
|
||
nixos.channel
|
||
(all nixos.dummy)
|
||
(all nixos.manual)
|
||
|
||
(all nixos.iso_minimal)
|
||
nixos.iso_graphical.x86_64-linux
|
||
nixos.ova.x86_64-linux
|
||
|
||
#(all nixos.tests.containers)
|
||
nixos.tests.chromium.x86_64-linux
|
||
(all nixos.tests.firefox)
|
||
(all nixos.tests.firewall)
|
||
(all nixos.tests.gnome3)
|
||
nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
|
||
(all nixos.tests.installer.lvm)
|
||
(all nixos.tests.installer.luksroot)
|
||
(all nixos.tests.installer.separateBoot)
|
||
(all nixos.tests.installer.separateBootFat)
|
||
(all nixos.tests.installer.simple)
|
||
(all nixos.tests.installer.simpleLabels)
|
||
(all nixos.tests.installer.simpleProvided)
|
||
(all nixos.tests.installer.simpleUefiSystemdBoot)
|
||
(all nixos.tests.installer.swraid)
|
||
(all nixos.tests.installer.btrfsSimple)
|
||
(all nixos.tests.installer.btrfsSubvols)
|
||
(all nixos.tests.installer.btrfsSubvolDefault)
|
||
(all nixos.tests.boot.biosCdrom)
|
||
#(all nixos.tests.boot.biosUsb) # disabled due to issue #15690
|
||
(all nixos.tests.boot.uefiCdrom)
|
||
(all nixos.tests.boot.uefiUsb)
|
||
(all nixos.tests.boot-stage1)
|
||
(all nixos.tests.hibernate)
|
||
nixos.tests.docker.x86_64-linux
|
||
(all nixos.tests.ecryptfs)
|
||
(all nixos.tests.env)
|
||
(all nixos.tests.ipv6)
|
||
(all nixos.tests.i3wm)
|
||
(all nixos.tests.keymap.azerty)
|
||
(all nixos.tests.keymap.colemak)
|
||
(all nixos.tests.keymap.dvorak)
|
||
(all nixos.tests.keymap.dvp)
|
||
(all nixos.tests.keymap.neo)
|
||
(all nixos.tests.keymap.qwertz)
|
||
(all nixos.tests.plasma5)
|
||
#(all nixos.tests.lightdm)
|
||
(all nixos.tests.login)
|
||
(all nixos.tests.misc)
|
||
(all nixos.tests.mutableUsers)
|
||
(all nixos.tests.nat.firewall)
|
||
(all nixos.tests.nat.standalone)
|
||
(all nixos.tests.networking.scripted.loopback)
|
||
(all nixos.tests.networking.scripted.static)
|
||
(all nixos.tests.networking.scripted.dhcpSimple)
|
||
(all nixos.tests.networking.scripted.dhcpOneIf)
|
||
(all nixos.tests.networking.scripted.bond)
|
||
(all nixos.tests.networking.scripted.bridge)
|
||
(all nixos.tests.networking.scripted.macvlan)
|
||
(all nixos.tests.networking.scripted.sit)
|
||
(all nixos.tests.networking.scripted.vlan)
|
||
(all nixos.tests.nfs3)
|
||
(all nixos.tests.nfs4)
|
||
(all nixos.tests.openssh)
|
||
(all nixos.tests.php-pcre)
|
||
(all nixos.tests.printing)
|
||
(all nixos.tests.proxy)
|
||
(all nixos.tests.sddm.default)
|
||
(all nixos.tests.simple)
|
||
(all nixos.tests.slim)
|
||
(all nixos.tests.switchTest)
|
||
(all nixos.tests.udisks2)
|
||
(all nixos.tests.xfce)
|
||
|
||
nixpkgs.tarball
|
||
(all allSupportedNixpkgs.emacs)
|
||
(all allSupportedNixpkgs.jdk)
|
||
];
|
||
});
|
||
|
||
}
|