Merge remote-tracking branch 'origin/master' into flake

Dependencies

• [2] EANSNASY Update to latest Nix and fix compilation
• [3] DDIRBIKR perlDeps: Use lib.closePropagation
• [4] T4LLYESZ * Nix expression for building Hydra.
• [5] 2TKJATAS epoch -> edition
• [6] QJB3G6E7 Add hydraProxy module
• [7] UBPWXGKF Move build logic for the core hydra package into its own default.nix.
• [8] 2IGIDHNA Replace shell.nix with a flake devShell attribute
• [9] P3M6UFMP Merge remote-tracking branch 'origin/master' into flake
• [10] X27GNHDV * Basic job info in the database.
• [11] 6A6CZ7SC draft manual
• [12] 6WN4GM2H Merge remote-tracking branch 'origin/master' into flake
• [13] 6LB22PZN Add a NixOS container to demo Hydra
• [14] CLXEECMF * Start putting build results in a database.
• [15] CCPSI3TP Add flake.nix
• [16] D3MDJONY
• [17] JN7Y4DC2 Add hydra status dd timeboard expression
• [18] SAFVRDTK * Put Hydra's dependencies so that they can easily be installed in a
• [19] 6EAXKZCU Use the overlay from the nix flake
• [20] XQLVYZFM Bump flake dependencies
• [21] QWR2YMEA Add default.nix, shell.nix for compatibility
• [22] DWQCLOPQ Tweaks for nix-shell
• [23] FV2M6MOT hydra: use autoconf/-make
• [24] GBCPEGYC Add a .gitignore
• [25] WQNI5TID Update to 20.03
• [26] 6K5PBUUN Use buildEnv to combine Hydra's Perl dependencies
• [27] SFMN6AFQ * Include a license.
• [28] X7IAG7JT Simplify running nix-shell
• [29] ZL4LHHZF Remove empty files
• [30] ICYJNJWH Revert "Move build logic for the core hydra package into its own default.nix."
• [31] Q6VFUIC6 Remove hydra-eval-guile-jobs
• [32] G2ZB6464 first test, not yet in buildprocess
• [33] NVMDS7GE Add README.md
• [34] UHMUHQMU hydra: fix tarball build, add pre suffix to tarballs
• [35] SAPEZKXH move file and add a basic README

Change contents

• file deletion: flake.nix (----------)
  [4.2]→[4.11946:11979](∅→∅),[4.11979]→[4.1:1](∅→∅)
  − {

  − description = "A Nix-based continuous build system";

  −

  − edition = 201909;

  −

  − inputs.nixpkgs.url = "nixpkgs/nixos-20.03";

  −

  − outputs = { self, nixpkgs, nix }:

  − let

  −

  − version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModified}.${self.shortRev or "DIRTY"}";

  −

  − pkgs = import nixpkgs {

  − system = "x86_64-linux";

  − overlays = [ self.overlay nix.overlay ];

  − };

  −

  − # NixOS configuration used for VM tests.

  − hydraServer =

  − { config, pkgs, ... }:

  − { imports = [ self.nixosModules.hydraTest ];

  −

  − virtualisation.memorySize = 1024;

  − virtualisation.writableStore = true;

  −

  − environment.systemPackages = [ pkgs.perlPackages.LWP pkgs.perlPackages.JSON ];

  −

  − nix = {

  − # Without this nix tries to fetch packages from the default

  − # cache.nixos.org which is not reachable from this sandboxed NixOS test.

  − binaryCaches = [];

  − };

  − };

  −

  − in rec {

  −

  − # A Nixpkgs overlay that provides a 'hydra' package.

  − overlay = final: prev: {

  −

  − hydra = with final; let

  −

  − perlDeps = buildEnv {

  − name = "hydra-perl-deps";

  − paths = with perlPackages; lib.closePropagation

  − [ ModulePluggable

  − CatalystActionREST

  − CatalystAuthenticationStoreDBIxClass

  − CatalystDevel

  − CatalystDispatchTypeRegex

  − CatalystPluginAccessLog

  − CatalystPluginAuthorizationRoles

  − CatalystPluginCaptcha

  − CatalystPluginSessionStateCookie

  − CatalystPluginSessionStoreFastMmap

  − CatalystPluginStackTrace

  − CatalystPluginUnicodeEncoding

  − CatalystTraitForRequestProxyBase

  − CatalystViewDownload

  − CatalystViewJSON

  − CatalystViewTT

  − CatalystXScriptServerStarman

  − CatalystXRoleApplicator

  − CryptRandPasswd

  − DBDPg

  − DBDSQLite

  − DataDump

  − DateTime

  − DigestSHA1

  − EmailMIME

  − EmailSender

  − FileSlurp

  − IOCompress

  − IPCRun

  − JSON

  − JSONAny

  − JSONXS

  − LWP

  − LWPProtocolHttps

  − NetAmazonS3

  − NetPrometheus

  − NetStatsd

  − PadWalker

  − Readonly

  − SQLSplitStatement

  − SetScalar

  − Starman

  − SysHostnameLong

  − TermSizeAny

  − TestMore

  − TextDiff

  − TextTable

  − XMLSimple

  − final.nix

  − final.nix.perl-bindings

  − git

  − ];

  − };

  −

  − in stdenv.mkDerivation {

  −

  − name = "hydra-${version}";

  −

  − src = self;

  −

  − buildInputs =

  − [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx

  − gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt

  − perlDeps perl final.nix

  − postgresql95 # for running the tests

  − boost

  − (if lib.versionAtLeast lib.version "20.03pre"

  − then nlohmann_json

  − else nlohmann_json.override { multipleHeaders = true; })

  − ];

  −

  − hydraPath = lib.makeBinPath (

  − [ sqlite subversion openssh final.nix coreutils findutils pixz

  − gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar

  − ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );

  −

  − configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];

  −

  − shellHook = ''

  − PATH=$(pwd)/src/hydra-evaluator:$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH

  − PERL5LIB=$(pwd)/src/lib:$PERL5LIB

  − '';

  −

  − preConfigure = "autoreconf -vfi";

  −

  − NIX_LDFLAGS = [ "-lpthread" ];

  −

  − enableParallelBuilding = true;

  −

  − doCheck = true;

  −

  − preCheck = ''

  − patchShebangs .

  − export LOGNAME=''${LOGNAME:-foo}

  − '';

  −

  − postInstall = ''

  − mkdir -p $out/nix-support

  −

  − for i in $out/bin/*; do

  − read -n 4 chars < $i

  − if [[ $chars =~ ELF ]]; then continue; fi

  − wrapProgram $i \

  − --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \

  − --prefix PATH ':' $out/bin:$hydraPath \

  − --set HYDRA_RELEASE ${version} \

  − --set HYDRA_HOME $out/libexec/hydra \

  − --set NIX_RELEASE ${final.nix.name or "unknown"}

  − done

  − '';

  −

  − dontStrip = true;

  −

  − meta.description = "Build of Hydra on ${system}";

  − passthru.perlDeps = perlDeps;

  − };

  − };

  −

  − hydraJobs = {

  −

  − build.x86_64-linux = packages.x86_64-linux.hydra;

  −

  − manual =

  − pkgs.runCommand "hydra-manual-${version}" {}

  − ''

  − mkdir -p $out/share

  − cp -prvd ${pkgs.hydra}/share/doc $out/share/

  −

  − mkdir $out/nix-support

  − echo "doc manual $out/share/doc/hydra" >> $out/nix-support/hydra-build-products

  − '';

  −

  − tests.install.x86_64-linux =

  − with import (nixpkgs + "/nixos/lib/testing.nix") { system = "x86_64-linux"; };

  − simpleTest {

  − machine = hydraServer;

  − testScript =

  − ''

  − $machine->waitForJob("hydra-init");

  − $machine->waitForJob("hydra-server");

  − $machine->waitForJob("hydra-evaluator");

  − $machine->waitForJob("hydra-queue-runner");

  − $machine->waitForOpenPort("3000");

  − $machine->succeed("curl --fail http://localhost:3000/");

  − '';

  − };

  −

  − tests.api.x86_64-linux =

  − with import (nixpkgs + "/nixos/lib/testing.nix") { system = "x86_64-linux"; };

  − simpleTest {

  − machine = hydraServer;

  − testScript =

  − let dbi = "dbi:Pg:dbname=hydra;user=root;"; in

  − ''

  − $machine->waitForJob("hydra-init");

  −

  − # Create an admin account and some other state.

  − $machine->succeed

  − ( "su - hydra -c \"hydra-create-user root --email-address 'alice\@example.org' --password foobar --role admin\""

  − , "mkdir /run/jobset /tmp/nix"

  − , "chmod 755 /run/jobset /tmp/nix"

  − , "cp ${./tests/api-test.nix} /run/jobset/default.nix"

  − , "chmod 644 /run/jobset/default.nix"

  − , "chown -R hydra /run/jobset /tmp/nix"

  − );

  −

  − $machine->succeed("systemctl stop hydra-evaluator hydra-queue-runner");

  − $machine->waitForJob("hydra-server");

  − $machine->waitForOpenPort("3000");

  −

  − # Run the API tests.

  − $machine->mustSucceed("su - hydra -c 'perl -I ${pkgs.hydra.perlDeps}/lib/perl5/site_perl ${./tests/api-test.pl}' >&2");

  − '';

  − };

  −

  − tests.notifications.x86_64-linux =

  − with import (nixpkgs + "/nixos/lib/testing.nix") { system = "x86_64-linux"; };

  − simpleTest {

  − machine = { pkgs, ... }: {

  − imports = [ hydraServer ];

  − services.hydra-dev.extraConfig = ''

  − <influxdb>

  − url = http://127.0.0.1:8086

  − db = hydra

  − </influxdb>

  − '';

  − services.influxdb.enable = true;

  − };

  − testScript = ''

  − $machine->waitForJob("hydra-init");

  −

  − # Create an admin account and some other state.

  − $machine->succeed

  − ( "su - hydra -c \"hydra-create-user root --email-address 'alice\@example.org' --password foobar --role admin\""

  − , "mkdir /run/jobset"

  − , "chmod 755 /run/jobset"

  − , "cp ${./tests/api-test.nix} /run/jobset/default.nix"

  − , "chmod 644 /run/jobset/default.nix"

  − , "chown -R hydra /run/jobset"

  − );

  −

  − # Wait until InfluxDB can receive web requests

  − $machine->waitForJob("influxdb");

  − $machine->waitForOpenPort("8086");

  −

  − # Create an InfluxDB database where hydra will write to

  − $machine->succeed(

  − "curl -XPOST 'http://127.0.0.1:8086/query' \\

  − --data-urlencode 'q=CREATE DATABASE hydra'");

  −

  − # Wait until hydra-server can receive HTTP requests

  − $machine->waitForJob("hydra-server");

  − $machine->waitForOpenPort("3000");

  −

  − # Setup the project and jobset

  − $machine->mustSucceed(

  − "su - hydra -c 'perl -I ${pkgs.hydra.perlDeps}/lib/perl5/site_perl ${./tests/setup-notifications-jobset.pl}' >&2");

  −

  − # Wait until hydra has build the job and

  − # the InfluxDBNotification plugin uploaded its notification to InfluxDB

  − $machine->waitUntilSucceeds(

  − "curl -s -H 'Accept: application/csv' \\

  − -G 'http://127.0.0.1:8086/query?db=hydra' \\

  − --data-urlencode 'q=SELECT * FROM hydra_build_status' | grep success");

  − '';

  − };

  −

  − container = nixosConfigurations.container.config.system.build.toplevel;

  − };

  −

  − checks.x86_64-linux.build = hydraJobs.build.x86_64-linux;

  − checks.x86_64-linux.install = hydraJobs.tests.install.x86_64-linux;

  −

  − packages.x86_64-linux.hydra = pkgs.hydra;

  − defaultPackage.x86_64-linux = pkgs.hydra;

  −

  − nixosModules.hydra = {

  − imports = [ ./hydra-module.nix ];

  − nixpkgs.overlays = [ self.overlay nix.overlay ];

  − };

  −

  − nixosModules.hydraTest = {

  − imports = [ self.nixosModules.hydra ];

  −

  − services.hydra-dev.enable = true;

  − services.hydra-dev.hydraURL = "http://hydra.example.org";

  − services.hydra-dev.notificationSender = "admin@hydra.example.org";

  −

  − systemd.services.hydra-send-stats.enable = false;

  −

  − services.postgresql.enable = true;

  − services.postgresql.package = pkgs.postgresql95;

  −

  − # The following is to work around the following error from hydra-server:

  − # [error] Caught exception in engine "Cannot determine local time zone"

  − time.timeZone = "UTC";

  −

  − nix.extraOptions = ''

  − allowed-uris = https://github.com/

  − '';

  − };

  −

  − nixosModules.hydraProxy = {

  − services.httpd = {

  − enable = true;

  − adminAddr = "hydra-admin@example.org";

  − extraConfig = ''

  − <Proxy *>

  − Order deny,allow

  − Allow from all

  − </Proxy>

  −

  − ProxyRequests Off

  − ProxyPreserveHost On

  − ProxyPass /apache-errors !

  − ErrorDocument 503 /apache-errors/503.html

  − ProxyPass / http://127.0.0.1:3000/ retry=5 disablereuse=on

  − ProxyPassReverse / http://127.0.0.1:3000/

  − '';

  − };

  − };

  −

  − nixosConfigurations.container = nixpkgs.lib.nixosSystem {

  − system = "x86_64-linux";

  − modules =

  − [ self.nixosModules.hydraTest

  − self.nixosModules.hydraProxy

  − { system.configurationRevision = self.rev;

  −

  − boot.isContainer = true;

  − networking.useDHCP = false;

  − networking.firewall.allowedTCPPorts = [ 80 ];

  − networking.hostName = "hydra";

  −

  − services.hydra-dev.useSubstitutes = true;

  − }

  − ];

  − };

  −

  − };

  − }
• replacement in flake.nix at line 6
  [4.218]→[4.650:698](∅→∅)
  − inputs.nixpkgs.uri = "nixpkgs/release-19.09";
  [4.218]

  [4.76]
  + inputs.nixpkgs.url = "nixpkgs/nixos-20.03";
• replacement in flake.nix at line 44
  [4.1996]→[4.1996:2035](∅→∅)
  − paths = with perlPackages;
  [4.1996]

  [4.2035]
  + paths = with perlPackages; lib.closePropagation
• replacement in flake.nix at line 111
  [4.4133]→[2.507:574](∅→∅)
  − (nlohmann_json.override { multipleHeaders = true; })
  [4.4133]

  [4.4161]
  + (if lib.versionAtLeast lib.version "20.03pre"

  + then nlohmann_json

  + else nlohmann_json.override { multipleHeaders = true; })