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

Merge pull request #55101 from lopsided98/hydra-update

Browse Source 
hydra: 2018-08-07 -> 2019-02-01
This commit is contained in:
lewo 2019-02-07 17:59:46 +01:00 committed by GitHub
commit 15e43d59cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nixos/tests/hydra/default.nix
View File

@ -1,6 +1,10 @@
import ../make-test.nix ({ pkgs, ...} : { system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../../.. { inherit system config; }
}:
let let
trivialJob = pkgs.writeTextDir "trivial.nix" '' trivialJob = pkgs.writeTextDir "trivial.nix" ''
{ trivial = builtins.derivation { { trivial = builtins.derivation {
name = "trivial"; name = "trivial";
@ -21,15 +25,21 @@ let
''; '';
}; };
in { callTest = f: f { inherit system pkgs; };
name = "hydra-init-localdb";
hydraPkgs = {
inherit (pkgs) nixStable nixUnstable;
};
tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
callTest (import ../make-test.nix ({ pkgs, lib, ... }:
{
name = "hydra-with-${name}";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ pstn lewo ma27 ]; maintainers = [ pstn lewo ma27 ];
}; };
machine = machine = { pkgs, ... }:
{ pkgs, ... }:
{ {
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
time.timeZone = "UTC"; time.timeZone = "UTC";
@ -41,6 +51,8 @@ in {
#Hydra needs those settings to start up, so we add something not harmfull. #Hydra needs those settings to start up, so we add something not harmfull.
hydraURL = "example.com"; hydraURL = "example.com";
notificationSender = "example@example.com"; notificationSender = "example@example.com";
package = pkgs.hydra.override { inherit nix; };
}; };
nix = { nix = {
buildMachines = [{ buildMachines = [{
@ -52,8 +64,7 @@ in {
}; };
}; };
testScript = testScript = ''
''
# let the system boot up # let the system boot up
$machine->waitForUnit("multi-user.target"); $machine->waitForUnit("multi-user.target");
# test whether the database is running # test whether the database is running
@ -74,4 +85,7 @@ in {
$machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq');
''; '';
}) })));
in
tests

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

@ -1,13 +1,17 @@
{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook
}: }:
with stdenv; with stdenv;
if lib.versions.major nix.version == "1"
then throw "This Hydra version doesn't support Nix 1.x"
else
let let
isGreaterNix20 = with lib.versions; isGreaterNix20 = with lib.versions;
let let
@ -34,8 +38,8 @@ let
CatalystViewDownload CatalystViewDownload
CatalystViewJSON CatalystViewJSON
CatalystViewTT CatalystViewTT
CatalystXRoleApplicator
CatalystXScriptServerStarman CatalystXScriptServerStarman
CatalystXRoleApplicator
CryptRandPasswd CryptRandPasswd
DBDPg DBDPg
DBDSQLite DBDSQLite
@ -71,15 +75,15 @@ let
}; };
in releaseTools.nixBuild rec { in releaseTools.nixBuild rec {
name = "hydra-${version}"; name = "hydra-${version}";
version = "2018-08-07"; version = "2019-02-01";
inherit stdenv; inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = "hydra";
rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd";
sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv";
}; };
buildInputs = buildInputs =
@ -88,6 +92,7 @@ in releaseTools.nixBuild rec {
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl nix perlDeps perl nix
postgresql # for running the tests postgresql # for running the tests
nlohmann_json
] ++ lib.optionals isGreaterNix20 [ boost ]; ] ++ lib.optionals isGreaterNix20 [ boost ];
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (