From 90d57c4ceb772730bb1082754ab07b52873b7beb Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 5 Oct 2021 09:56:56 -0400
Subject: [PATCH] yank some other derivations up to the top-level here too
now that default.nix is actually somewhat useful
---
.gitlab-ci.yml | 4 ++--
default.nix | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 019c7b28..bd56bbc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ docs:
unit-tests:
stage: "test"
script:
- - "nix-shell --run 'nix-build nixos/unit-tests.nix' && cat result"
+ - "nix-build --attr unit-tests && cat result"
.morph-build: &MORPH_BUILD
stage: "test"
@@ -70,7 +70,7 @@ system-tests:
stage: "test"
timeout: "3 hours"
script:
- - "nix-shell --run 'nix-build nixos/system-tests.nix'"
+ - "nix-build --attr system-tests"
# A template for a job that can update one of the grids.
.update-grid: &UPDATE_GRID
diff --git a/default.nix b/default.nix
index 578e5f4e..9d9784d5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,14 @@
{ pkgs ? import ./nixpkgs-2105.nix { } }:
{
+ # Render the project documentation source to some presentation format (ie,
+ # html) with Sphinx.
docs = pkgs.callPackage ./docs.nix { };
+
+ # Run some system integration tests in VMs covering some of the software
+ # we're integrating (ie, application functionality).
+ system-tests = import ./nixos/system-tests.nix;
+
+ # Run some unit tests of the Nix that ties all of these things together (ie,
+ # PrivateStorageio-internal library functionality).
+ unit-tests = import ./nixos/unit-tests.nix;
}
--
GitLab