jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
0bd211d84f
nixpkgs/nixos/release-combined.nix

107 lines
3.6 KiB
Nix
Raw Normal View History

Add all default NixOS packages to the channel The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
2014-09-24 22:20:53 +00:00
# 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).
release.nix: Drop officialRelease flag
2014-05-01 12:52:07 +00:00
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
Propagate the stableBranch argument
2013-10-31 21:04:26 +00:00
, stableBranch ? false
nixos: Add support for changing supported systems release.nix and release-combined.nix current hardcode the systems which they are built for. This change introduces an argument to the expressions called supportedSystems, which allows the builder to choose which architectures he wants to build. By default, this uses the same linux x86_64 and i686 architectures.
2014-04-21 01:06:54 +00:00
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
}:
release-combined: Remove maintainers from everything but `tested' This will make it possible to turn on email notifications for the `tested' job without duplicating emails for all the other jobs Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 17:59:43 +00:00
let
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
nixpkgsSrc = nixpkgs; # urgh
Grmbl
2013-03-26 13:44:24 +00:00
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
pkgs = import ./.. {};
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
release-combined: Remove maintainers from everything but `tested' This will make it possible to turn on email notifications for the `tested' job without duplicating emails for all the other jobs Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 17:59:43 +00:00
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;
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
release-combined: Remove maintainers from everything but `tested' This will make it possible to turn on email notifications for the `tested' job without duplicating emails for all the other jobs Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 17:59:43 +00:00
in rec {
Fix mousepad
2013-08-15 14:37:53 +00:00
release-combined: Remove maintainers from everything but `tested' This will make it possible to turn on email notifications for the `tested' job without duplicating emails for all the other jobs Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 17:59:43 +00:00
nixos = removeMaintainers (import ./release.nix {
Add all default NixOS packages to the channel The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
2014-09-24 22:20:53 +00:00
inherit stableBranch supportedSystems;
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
nixpkgs = nixpkgsSrc;
release-combined: Remove maintainers from everything but `tested' This will make it possible to turn on email notifications for the `tested' job without duplicating emails for all the other jobs Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 17:59:43 +00:00
});
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
release.nix: Drop officialRelease flag
2014-05-01 12:52:07 +00:00
inherit supportedSystems;
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
nixpkgs = nixpkgsSrc;
Remove the nixos.unstable job from the trunk-combined jobset
2013-10-05 20:52:29 +00:00
})) [ "unstable" ];
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
Rename scrubDrv -> hydraJob and make it more effective It now strictly evaluates all remaining attributes, preventing unevaluated thunks that cannot be garbage-collected. It's also applied to all jobs in Nixpkgs' release.nix. This reduces hydra-eval-jobs' memory consumption on the 14.12 release-combined jobset from 5.1 GB to 2.0 GB.
2015-03-20 18:23:55 +00:00
tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
Update the release expressions and the channel generators
2013-10-01 13:48:39 +00:00
name = "nixos-${nixos.channel.version}";
"Maintain" the tested job so I get notifications when it fails Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 16:35:28 +00:00
meta = {
Add all default NixOS packages to the channel The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
2014-09-24 22:20:53 +00:00
description = "Release-critical builds for the NixOS channel";
maintainers = [ pkgs.lib.maintainers.eelco ];
"Maintain" the tested job so I get notifications when it fails Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 16:35:28 +00:00
};
Rename ‘members’ to ‘constituents’
2013-08-15 01:09:43 +00:00
constituents =
Add all default NixOS packages to the channel The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
2014-09-24 22:20:53 +00:00
let all = x: map (system: x.${system}) supportedSystems; in
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
[ nixos.channel
Add all default NixOS packages to the channel The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
2014-09-24 22:20:53 +00:00
(all nixos.dummy)
Generate manual for i686-linux as well as x86_64-linux
2013-10-31 07:48:57 +00:00
(all nixos.manual)
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.iso_minimal)
Fix NixOS tested job
2016-03-15 14:43:57 +00:00
nixos.iso_graphical.x86_64-linux
nixos.ova.x86_64-linux
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
Remove the containers test from the release-critical builds Too many random failures...
2014-08-05 08:25:42 +00:00
#(all nixos.tests.containers)
Revert "Temporarily disable chromium test" This reverts commit 9e6eec201b8b56ef493c60af3acb2e8ddd8be258. Verified locally that cd063d7 fixes the problem. cc @edolstra @aszlig
2016-08-23 13:13:49 +00:00
nixos.tests.chromium
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.firefox)
(all nixos.tests.firewall)
Don't block releases on nixos.tests.gnome3.i686-linux http://hydra.nixos.org/build/26702440 Issue #10353.
2015-10-14 11:55:11 +00:00
nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.installer.lvm)
nixos/release: Add luksroot test to "tested" job. We want to avoid getting broken LUKS systems into the latest channel, so let's ensure that the channel update won't happen if LUKS support is broken again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 11:17:25 +00:00
(all nixos.tests.installer.luksroot)
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.installer.separateBoot)
nixos/tests/installer: Add a testcase for fat32 /boot
2015-07-08 19:05:31 +00:00
(all nixos.tests.installer.separateBootFat)
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.installer.simple)
Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853. Conflicts: nixos/modules/system/boot/loader/grub/install-grub.pl
2014-08-31 16:18:13 +00:00
(all nixos.tests.installer.simpleLabels)
(all nixos.tests.installer.simpleProvided)
nixos: Re-add swraid installer tests to releases. It has been removed by 71a197bc6e60c2c35687fc862cec9a0036a3877e. I'm reintroducing the test mainly because it actually *is* useful, because right now, machines with mdraid will not boot. In order to prevent such things from happening in the future, we should *not* remove this VM test again. If it really goes back to failing randomly, we should really try to fix it instead of removing it again. Of course it fails right now because of the mdraid bump in 7719f7f. Also, if you want to have additional info about the reasons, have a look at the commit message of 666cf992f05d20c537da7f495afe3622023495d2. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-01 06:42:00 +00:00
(all nixos.tests.installer.swraid)
Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853. Conflicts: nixos/modules/system/boot/loader/grub/install-grub.pl
2014-08-31 16:18:13 +00:00
(all nixos.tests.installer.btrfsSimple)
(all nixos.tests.installer.btrfsSubvols)
nixos/tests-installer: Add a test for btrfs default volumes and bind mounts
2014-08-29 23:37:28 +00:00
(all nixos.tests.installer.btrfsSubvolDefault)
nixos/tests: Remove tests.boot.boot* prefixes As @bobvanderlinden suggests in #13585: "Looks like that cleans things up quite a bit! Just one aesthetics note, the boot tests could now be renamed from boot.bootBiosCdrom to boot.biosCdrom in nixos/tests/boot.nix:L33. That makes them more consistent with the other tests." Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-01 18:02:36 +00:00
(all nixos.tests.boot.biosCdrom)
Remove nixos.tests.boot.biosUsb.* as release blockers These have a high random failure rate, blocking channel updates. Issue
2016-07-21 09:44:55 +00:00
#(all nixos.tests.boot.biosUsb) # disabled due to issue #15690
make all boot tests release critical #14902 (cherry picked from commit 9d1662c6c90059b63fad01b3f55a0df94af7cde4) Signed-off-by: Domen Kožar <domen@dev.si>
2016-04-23 12:11:32 +00:00
(all nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb)
nixos/release-combined: Add boot-stage1 test We don't want to push out a channel update whenever this test fails, because that might have unexpected and confused side effects and it *really* means that stage 1 of our boot up is broken. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-06 14:56:54 +00:00
(all nixos.tests.boot-stage1)
tested job: drop the hibernate test on i686 for now /cc #23107.
2017-03-02 06:26:27 +00:00
nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
ecryptfs: add test to release-combined.nix
2016-07-14 09:52:08 +00:00
(all nixos.tests.ecryptfs)
Make more tests release-critical
2013-10-17 10:20:07 +00:00
(all nixos.tests.ipv6)
Make i3wm test a release blocker Catch issues like https://github.com/NixOS/nixpkgs/commit/331fa2feff8cbdca5cc831d1fae36d9505618124
2016-05-26 09:46:48 +00:00
(all nixos.tests.i3wm)
nixos/tests: fix Plasma 5 test
2017-03-01 01:09:56 +00:00
(all nixos.tests.plasma5)
Disable lightdm test It's hanging in the OCR step for hours. @aszlig http://hydra.nixos.org/build/24268601
2015-08-17 08:48:04 +00:00
#(all nixos.tests.lightdm)
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.login)
(all nixos.tests.misc)
nixos/tests/nat: Add tests for standalone and firewall based nat
2014-09-18 20:34:29 +00:00
(all nixos.tests.nat.firewall)
(all nixos.tests.nat.standalone)
nixos/tests/networking: Add a test for loopback It serves as a regression test, because right now if you enable networking.useNetworkd the default loopback interface doesn't get assigned any IP addresses. To be sure, I have bisected this and it has been introduced with the update to systemd 228 in 1da87d4. Only the "scripted" networking tests have to succeed in order to trigger a channel update of nixos-unstable, so I'm leaving this test as broken and we have to figure out next what's the *exact* reason for the breakage. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-18 06:09:42 +00:00
(all nixos.tests.networking.scripted.loopback)
nixos/tests: Add networking tests for basic functionality
2014-11-25 23:40:49 +00:00
(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)
Make more tests release-critical
2013-10-17 10:20:07 +00:00
(all nixos.tests.nfs3)
Make the NFSv4 tests release-critical We can probably drop NFSv3...
2016-09-07 12:12:47 +00:00
(all nixos.tests.nfs4)
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.openssh)
Add a test for CUPS
2013-09-26 19:00:30 +00:00
(all nixos.tests.printing)
Make more tests release-critical
2013-10-17 10:20:07 +00:00
(all nixos.tests.proxy)
nixos: add sddm test to combined constituents
2015-12-10 16:31:09 +00:00
(all nixos.tests.sddm)
Make some tests release-critical
2014-04-25 15:08:58 +00:00
(all nixos.tests.simple)
Add a test for udisks2
2014-04-19 12:37:05 +00:00
(all nixos.tests.udisks2)
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixos.tests.xfce)
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
nixpkgs.tarball
Add more jobs to the "tested" aggregate
2013-08-15 11:19:27 +00:00
(all nixpkgs.emacs)
Make OpenJDK release-critical Currently there are no tests that depend on the JDK. Since we don't want a release with a broken JDK, make it an explicit dependency of the "tested" jobs.
2015-07-14 14:01:46 +00:00
(all nixpkgs.jdk)
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
];
Rename scrubDrv -> hydraJob and make it more effective It now strictly evaluates all remaining attributes, preventing unevaluated thunks that cannot be garbage-collected. It's also applied to all jobs in Nixpkgs' release.nix. This reduces hydra-eval-jobs' memory consumption on the 14.12 release-combined jobset from 5.1 GB to 2.0 GB.
2015-03-20 18:23:55 +00:00
});
Add an aggregated to replace the "tested" NixOS view Also get rid of the "system" jobset input.
2013-03-26 13:00:31 +00:00
* Include all of Nixpkgs. svn path=/nixos/trunk/; revision=33744
2012-04-11 09:17:32 +00:00
}
Reference in New Issue Copy Permalink