Commit 2de3caf0 authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

nixos/release-combined.nix: List constituents of the 'tested' job by name

parent b2492bc4
Loading
Loading
Loading
Loading
+80 −98
Original line number Diff line number Diff line
@@ -38,108 +38,90 @@ in rec {
    nixpkgs = nixpkgsSrc;
  })) [ "unstable" ];

  tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
  tested = 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
        # Except for the given systems, return the system-specific constituent
        except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
        all = x: except [] x;
      in [
        nixos.channel
        (all nixos.dummy)
        (all nixos.manual)

        nixos.iso_plasma5.x86_64-linux or []
        nixos.iso_minimal.aarch64-linux or []
        nixos.iso_minimal.i686-linux or []
        nixos.iso_minimal.x86_64-linux or []
        nixos.ova.x86_64-linux or []
        nixos.sd_image.aarch64-linux or []

        #(all nixos.tests.containers)
        (all nixos.tests.containers-imperative)
        (all nixos.tests.containers-ip)
        nixos.tests.chromium.x86_64-linux or []
        (all nixos.tests.firefox)
        (all nixos.tests.firefox-esr)
        (all nixos.tests.firewall)
        (all nixos.tests.fontconfig-default-fonts)
        (all nixos.tests.gnome3-xorg)
        (all nixos.tests.gnome3)
        (all nixos.tests.pantheon)
        nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
        (except ["aarch64-linux"] nixos.tests.installer.lvm)
        (except ["aarch64-linux"] nixos.tests.installer.luksroot)
        (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
        (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
        (except ["aarch64-linux"] nixos.tests.installer.simple)
        (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
        (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
        (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
        (except ["aarch64-linux"] nixos.tests.installer.swraid)
        (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
        (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
        #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
        (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
        (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
        (all nixos.tests.boot-stage1)
        (all nixos.tests.hibernate)
        nixos.tests.docker.x86_64-linux or []
        (all nixos.tests.ecryptfs)
        (all nixos.tests.env)
        (all nixos.tests.ipv6)
        (all nixos.tests.i3wm)
        (except ["aarch64-linux"] nixos.tests.keymap.azerty)
        (except ["aarch64-linux"] nixos.tests.keymap.colemak)
        (except ["aarch64-linux"] nixos.tests.keymap.dvorak)
        (except ["aarch64-linux"] nixos.tests.keymap.dvp)
        (except ["aarch64-linux"] nixos.tests.keymap.neo)
        (except ["aarch64-linux"] 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.firewall-conntrack)
        (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.simple)
        (all nixos.tests.nfs4.simple)
        (all nixos.tests.openssh)
        (all nixos.tests.php-pcre)
        (all nixos.tests.predictable-interface-names.predictable)
        (all nixos.tests.predictable-interface-names.unpredictable)
        (all nixos.tests.predictable-interface-names.predictableNetworkd)
        (all nixos.tests.predictable-interface-names.unpredictableNetworkd)
        (all nixos.tests.printing)
        (all nixos.tests.proxy)
        (all nixos.tests.sddm.default)
        (all nixos.tests.simple)
        (all nixos.tests.switchTest)
        (all nixos.tests.udisks2)
        (all nixos.tests.xfce)

        nixpkgs.tarball
        (all allSupportedNixpkgs.emacs)
        # The currently available aarch64 JDK is unfree
        (except ["aarch64-linux"] allSupportedNixpkgs.jdk)
    constituents = [
      "nixos.channel"
      "nixos.dummy.x86_64-linux"
      "nixos.iso_minimal.aarch64-linux"
      "nixos.iso_minimal.i686-linux"
      "nixos.iso_minimal.x86_64-linux"
      "nixos.iso_plasma5.x86_64-linux"
      "nixos.manual.x86_64-linux"
      "nixos.ova.x86_64-linux"
      "nixos.sd_image.aarch64-linux"
      "nixos.tests.boot.biosCdrom.x86_64-linux"
      "nixos.tests.boot-stage1.x86_64-linux"
      "nixos.tests.boot.uefiCdrom.x86_64-linux"
      "nixos.tests.boot.uefiUsb.x86_64-linux"
      "nixos.tests.chromium.x86_64-linux"
      "nixos.tests.containers-imperative.x86_64-linux"
      "nixos.tests.containers-ip.x86_64-linux"
      "nixos.tests.docker.x86_64-linux"
      "nixos.tests.ecryptfs.x86_64-linux"
      "nixos.tests.env.x86_64-linux"
      "nixos.tests.firefox.x86_64-linux"
      "nixos.tests.firewall.x86_64-linux"
      "nixos.tests.fontconfig-default-fonts.x86_64-linux"
      "nixos.tests.gnome3.x86_64-linux"
      "nixos.tests.gnome3-xorg.x86_64-linux"
      "nixos.tests.hibernate.x86_64-linux"
      "nixos.tests.i3wm.x86_64-linux"
      "nixos.tests.installer.btrfsSimple.x86_64-linux"
      "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux"
      "nixos.tests.installer.btrfsSubvols.x86_64-linux"
      "nixos.tests.installer.luksroot.x86_64-linux"
      "nixos.tests.installer.lvm.x86_64-linux"
      "nixos.tests.installer.separateBootFat.x86_64-linux"
      "nixos.tests.installer.separateBoot.x86_64-linux"
      "nixos.tests.installer.simpleLabels.x86_64-linux"
      "nixos.tests.installer.simpleProvided.x86_64-linux"
      "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux"
      "nixos.tests.installer.simple.x86_64-linux"
      "nixos.tests.installer.swraid.x86_64-linux"
      "nixos.tests.ipv6.x86_64-linux"
      "nixos.tests.lightdm.x86_64-linux"
      "nixos.tests.login.x86_64-linux"
      "nixos.tests.misc.x86_64-linux"
      "nixos.tests.mutableUsers.x86_64-linux"
      "nixos.tests.nat.firewall-conntrack.x86_64-linux"
      "nixos.tests.nat.firewall.x86_64-linux"
      "nixos.tests.nat.standalone.x86_64-linux"
      "nixos.tests.networking.scripted.bond.x86_64-linux"
      "nixos.tests.networking.scripted.bridge.x86_64-linux"
      "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux"
      "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux"
      "nixos.tests.networking.scripted.loopback.x86_64-linux"
      "nixos.tests.networking.scripted.macvlan.x86_64-linux"
      "nixos.tests.networking.scripted.sit.x86_64-linux"
      "nixos.tests.networking.scripted.static.x86_64-linux"
      "nixos.tests.networking.scripted.vlan.x86_64-linux"
      "nixos.tests.nfs3.simple.x86_64-linux"
      "nixos.tests.nfs4.simple.x86_64-linux"
      "nixos.tests.openssh.x86_64-linux"
      "nixos.tests.pantheon.x86_64-linux"
      "nixos.tests.php-pcre.x86_64-linux"
      "nixos.tests.plasma5.x86_64-linux"
      "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
      "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
      "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
      "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
      "nixos.tests.printing.x86_64-linux"
      "nixos.tests.proxy.x86_64-linux"
      "nixos.tests.sddm.default.x86_64-linux"
      "nixos.tests.simple.x86_64-linux"
      "nixos.tests.switchTest.x86_64-linux"
      "nixos.tests.udisks2.x86_64-linux"
      "nixos.tests.xfce.x86_64-linux"
      "nixos.tests.zfs.installer.i686-linux"
      "nixpkgs.emacs.x86_64-linux"
      "nixpkgs.jdk.x86_64-linux"
      "nixpkgs.tarball"
    ];
  });
  };

}