public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hydra*: add passthru.tests to reference VM-tests

Browse Source
This commit is contained in:
Maximilian Bosch 2020-04-15 22:14:20 +02:00
parent 6f6c08af30
commit ef80b6324b
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/misc/hydra/common.nix
View File

@ -5,6 +5,7 @@
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false, patches ? [] , migration ? false, patches ? []
, tests ? {}
}: }:
with stdenv; with stdenv;
@ -124,7 +125,7 @@ in stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
passthru = { inherit perlDeps migration; }; passthru = { inherit perlDeps migration tests; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Nix-based continuous build system"; description = "Nix-based continuous build system";

11
pkgs/development/tools/misc/hydra/default.nix
View File

@ -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. # Package for phase-1 of the db migration for Hydra.
@ -13,6 +13,11 @@
}; };
nix = nixStable; nix = nixStable;
migration = true; migration = true;
tests = {
db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-migration;
};
}; };
# Hydra from latest master branch. Contains breaking changes, # Hydra from latest master branch. Contains breaking changes,
@ -27,5 +32,9 @@
sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5";
}; };
nix = nixFlakes; nix = nixFlakes;
tests = {
db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-unstable;
};
}; };
} }