about summary refs log tree commit diff
path: root/nixos/release-combined.nix
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-09-04 19:02:44 -0400
committerTim Steinbach <tim@nequissimus.com>2017-09-04 19:02:44 -0400
commit380ed98bd793b2f3cbf257b7ef9601770c4f8d48 (patch)
tree214dbc40e01af13e63344f1399f63f7e86491e6d /nixos/release-combined.nix
parent2bb57ef7761fc9d408bb27b2733d36c8640e0e4b (diff)
docker: Add test for docker-edge, check for proper versions in tests
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r--nixos/release-combined.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 54fd4a15ffccc..4bf5df293fe84 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -81,6 +81,8 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
+        nixos.tests.docker.x86_64-linux
+        nixos.tests.docker-edge.x86_64-linux
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)