grahamc/hydra - Change P3M6UFMPTIF7TPCFZHRDFX4MTXB6NZWT3ZFUEIC5VMNM55E7EIKAC

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

Created by Eelco Dolstra on September 24, 2019

P3M6UFMPTIF7TPCFZHRDFX4MTXB6NZWT3ZFUEIC5VMNM55E7EIKAC

Dependencies

In channels

upstream

main

Change contents

File deletion: flake.nix

BF:BFD[6.2] → [7.581:614]

BF:BFD[7.614] → [7.229:229]

B:BD[7.229] → [7.230:232]

B:BD[7.251] → [7.251:307]

B:BD[7.307] → [8.522:540]

∅:D[9.305] → [7.352:353]

∅:D[10.496] → [7.352:353]

∅:D[11.605] → [7.352:353]

∅:D[8.608] → [7.352:353]

B:BD[7.352] → [7.352:353]

B:BD[7.353] → [3.0:36]

∅:D[3.36] → [9.326:334]

∅:D[8.652] → [9.326:334]

B:BD[9.326] → [9.326:334]

B:BD[9.334] → [3.37:408]

∅:D[3.408] → [10.640:649]

∅:D[8.782] → [10.640:649]

∅:D[11.840] → [10.640:649]

B:BD[10.640] → [10.640:649]

B:BD[10.649] → [3.409:1696]

∅:D[3.1696] → [9.335:349]

B:BD[10.649] → [9.335:349]

B:BD[9.349] → [3.1697:10128]

∅:D[3.10128] → [9.477:486]

B:BD[9.477] → [9.477:486]

∅:D[9.486] → [7.483:484]

B:BD[7.483] → [7.483:484]

B:BD[7.484] → [9.487:599]

∅:D[9.599] → [12.108:109]

B:BD[12.108] → [12.108:109]

B:BD[12.109] → [3.10129:10199]

∅:D[9.693] → [13.0:1]

∅:D[3.10199] → [13.0:1]

B:BD[7.573] → [13.0:1]

B:BD[13.1] → [3.10200:10325]

∅:D[9.873] → [13.145:146]

∅:D[3.10325] → [13.145:146]

B:BD[13.145] → [13.145:146]

B:BD[13.146] → [9.874:881]

∅:D[9.881] → [7.578:580]

B:BD[7.578] → [7.578:580]

{
  description = "A Nix-based continuous build system";
  epoch = 201909;
  outputs = { self, nixpkgs, nix }:
    let
      version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModified}.${self.shortRev}";
      # FIXME: use nix overlay?
      nix' = nix.hydraJobs.build.x86_64-linux // {
        perl-bindings = nix.hydraJobs.perlBindings.x86_64-linux;
      };
      pkgs = import nixpkgs {
        system = "x86_64-linux";
        overlays = [ self.overlay ];
      };
      # NixOS configuration used for VM tests.
      hydraServer =
        { config, pkgs, ... }:
        { imports = [ self.nixosModules.hydra ];
          virtualisation.memorySize = 1024;
          virtualisation.writableStore = true;
          services.hydra-dev.enable = true;
          services.hydra-dev.hydraURL = "http://hydra.example.org";
          services.hydra-dev.notificationSender = "admin@hydra.example.org";
          services.postgresql.enable = true;
          services.postgresql.package = pkgs.postgresql95;
          environment.systemPackages = [ pkgs.perlPackages.LWP pkgs.perlPackages.JSON ];
          # 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 = {
            # The following is to work around: https://github.com/NixOS/hydra/pull/432
            buildMachines = [
              { hostName = "localhost";
                system = "x86_64-linux";
              }
            ];
            # 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;
              [ 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
                NetStatsd
                PadWalker
                Readonly
                SQLSplitStatement
                SetScalar
                Starman
                SysHostnameLong
                TestMore
                TextDiff
                TextTable
                XMLSimple
                nix'
                nix'.perl-bindings
                git
                boehmgc
              ];
          };
        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
              guile # optional, for Guile + Guix support
              perlDeps perl nix'
              postgresql95 # for running the tests
              boost
              nlohmann_json
            ];
          hydraPath = lib.makeBinPath (
            [ sqlite subversion openssh 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;
          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 ${nix'.name or "unknown"}
            done
          '';
          dontStrip = true;
          meta.description = "Build of Hydra on ${system}";
          passthru.perlDeps = perlDeps;
        };
      };
      hydraJobs = {
        build.x86_64-linux = packages.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");
            '';
        };
      };
      checks.build = hydraJobs.build.x86_64-linux;
      checks.install = hydraJobs.tests.install.x86_64-linux;
      packages.hydra = pkgs.hydra;
      defaultPackage = pkgs.hydra;
      nixosModules.hydra = {
        imports = [ ./hydra-module.nix ];
        nixpkgs.overlays = [ self.overlay ];
      };
    };
}

File un-deletion:
BFD:BF[14.1891] → [14.1:1]
Solving a name conflict: release.nix, release.nix
BFD:BFD[6.2] → [14.1856:1891]
BFD:BFD[6.2] → [14.1856:1891]

Replacement in flake.nix at line 1 [14.1]

B:BD[15.1958] → [5.0:24]

BD:BD[15.1958] → [5.0:24]

            TermSizeAny

[14.1]

{
  description = "A Nix-based continuous build system";
  epoch = 201909;
  outputs = { self, nixpkgs, nix }:
    let
      version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModified}.${self.shortRev}";
      # FIXME: use nix overlay?
      nix' = nix.hydraJobs.build.x86_64-linux // {
        perl-bindings = nix.hydraJobs.perlBindings.x86_64-linux;
      };
      pkgs = import nixpkgs {
        system = "x86_64-linux";
        overlays = [ self.overlay ];
      };
      # NixOS configuration used for VM tests.
      hydraServer =
        { config, pkgs, ... }:
        { imports = [ self.nixosModules.hydra ];
          virtualisation.memorySize = 1024;
          virtualisation.writableStore = true;
          services.hydra-dev.enable = true;
          services.hydra-dev.hydraURL = "http://hydra.example.org";
          services.hydra-dev.notificationSender = "admin@hydra.example.org";
          services.postgresql.enable = true;
          services.postgresql.package = pkgs.postgresql95;
          environment.systemPackages = [ pkgs.perlPackages.LWP pkgs.perlPackages.JSON ];
          # 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 = {
            # The following is to work around: https://github.com/NixOS/hydra/pull/432
            buildMachines = [
              { hostName = "localhost";
                system = "x86_64-linux";
              }
            ];
            # 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;
              [ 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
                NetStatsd
                PadWalker
                Readonly
                SQLSplitStatement
                SetScalar
                Starman
                SysHostnameLong
                TermSizeAny
                TestMore
                TextDiff
                TextTable
                XMLSimple
                nix'
                nix'.perl-bindings
                git
                boehmgc
              ];
          };
        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
              guile # optional, for Guile + Guix support
              perlDeps perl nix'
              postgresql95 # for running the tests
              boost
              nlohmann_json
            ];
          hydraPath = lib.makeBinPath (
            [ sqlite subversion openssh 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;
          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 ${nix'.name or "unknown"}
            done
          '';
          dontStrip = true;
          meta.description = "Build of Hydra on ${system}";
          passthru.perlDeps = perlDeps;
        };
      };
      hydraJobs = {
        build.x86_64-linux = packages.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");
            '';
        };
      };
      checks.build = hydraJobs.build.x86_64-linux;
      checks.install = hydraJobs.tests.install.x86_64-linux;
      packages.hydra = pkgs.hydra;
      defaultPackage = pkgs.hydra;
      nixosModules.hydra = {
        imports = [ ./hydra-module.nix ];
        nixpkgs.overlays = [ self.overlay ];
      };
    };
}

Solving an order conflict in src/lib/Hydra/Schema/Builds.pm at line 198 [16.5202]
[2.1433]
[4.0]
Deletion in src/lib/Hydra/Schema/Builds.pm at line 199 [16.5202]
B:BD[4.1] → [4.1:74]
∅:D[4.74] → [17.6142:6143]
∅:D[2.1433] → [17.6142:6143]
B:BD[17.6142] → [17.6142:6143]
```
=head2 notificationpendingsince
  data_type: 'integer'
  is_nullable: 1
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 262 [16.5202]
B:BD[17.6719] → [4.75:153]
```
  "notificationpendingsince",
  { data_type => "integer", is_nullable => 1 },
```
Solving an order conflict in src/lib/Hydra/Schema/Builds.pm at line 262 [16.5202]
[2.1512]
[16.5911]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 547 [16.5202]

B:BD[18.3378] → [2.1513:1655]

# Created by DBIx::Class::Schema::Loader v0.07049 @ 2019-05-10 22:30:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YK8Fc+37UAcL0u6ziOc5xQ

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

Dependencies

In channels

Change contents

File deletion: flake.nix

File un-deletion:

Solving a name conflict: release.nix, release.nix

Replacement in flake.nix at line 1 [14.1]

Solving an order conflict in src/lib/Hydra/Schema/Builds.pm at line 198 [16.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 199 [16.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 262 [16.5202]

Solving an order conflict in src/lib/Hydra/Schema/Builds.pm at line 262 [16.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 547 [16.5202]