about summary refs log tree commit diff
path: root/nixos/release-combined.nix
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2017-09-06 15:03:56 -0400
committerGitHub <noreply@github.com>2017-09-06 15:03:56 -0400
commita54b2e3ba226c9fa3e7f4ec72fbada8e0859a300 (patch)
tree53674fa574ad4844534a85b7da4d0a20d155a0a9 /nixos/release-combined.nix
parent0857e4c84d3ba9e4faa52aa033bbde3607652e86 (diff)
parent380ed98bd793b2f3cbf257b7ef9601770c4f8d48 (diff)
Merge pull request #29002 from NeQuissimus/docker_edge_module_test
docker: Package in module, 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 78874641bd2b8..0193a464b9500 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)