diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-15 22:14:20 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-16 01:01:31 +0200 |
| commit | ef80b6324b9c387256027159796f4f5adbfffe6a (patch) | |
| tree | ad96a54e106773a74cbbd64a31b400a7e80c2727 /pkgs/development/tools/misc | |
| parent | 6f6c08af30ceafe36580205e829321b763e04af3 (diff) | |
| download | nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar.gz nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar.bz2 nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar.lz nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar.xz nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.tar.zst nixlib-ef80b6324b9c387256027159796f4f5adbfffe6a.zip | |
hydra*: add `passthru.tests` to reference VM-tests
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 52a91db67582..75a9689267a1 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -5,6 +5,7 @@ , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] +, tests ? {} }: with stdenv; @@ -124,7 +125,7 @@ in stdenv.mkDerivation rec { dontStrip = true; - passthru = { inherit perlDeps migration; }; + passthru = { inherit perlDeps migration tests; }; meta = with stdenv.lib; { description = "Nix-based continuous build system"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 12b70c8a5aee..f9a50dd0ea0e 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -13,6 +13,11 @@ }; nix = nixStable; migration = true; + + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-migration; + }; }; # Hydra from latest master branch. Contains breaking changes, @@ -27,5 +32,9 @@ sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; }; nix = nixFlakes; + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-unstable; + }; }; } |