Merge pull request #1449 from knedlsepp/fix-metrics-rendering-with-special-characters

Fix rendering of metrics with special characters

.github/workflows/test.yml

@@ -1,10 +1,7 @@
 name: "Test"
 on:
   pull_request:
-  merge_group:
   push:
-    branches:
-      - master
 jobs:
   tests:
     runs-on: ubuntu-latest

.gitignore

@@ -3,7 +3,6 @@
 /src/sql/hydra-postgresql.sql
 /src/sql/hydra-sqlite.sql
 /src/sql/tmp.sqlite
-.hydra-data
 result
 result-*
 outputs

README.md

@@ -72,16 +72,17 @@ Make sure **State** at the top of the page is set to "_Enabled_" and click on "_
 You can build Hydra via `nix-build` using the provided [default.nix](./default.nix):
 
 ```
-$ nix build
+$ nix-build
 ```
 
 ### Development Environment
 
 You can use the provided shell.nix to get a working development environment:
 ```
-$ nix develop
-$ mesonConfigurePhase
-$ ninja
+$ nix-shell
+$ autoreconfPhase
+$ configurePhase # NOTE: not ./configure
+$ make
 ```
 
 ### Executing Hydra During Development
@@ -90,9 +91,9 @@ When working on new features or bug fixes you need to be able to run Hydra from
 can be done using [foreman](https://github.com/ddollar/foreman):
 
 ```
-$ nix develop
+$ nix-shell
 $ # hack hack
-$ ninja -C build
+$ make
 $ foreman start
 ```
 
@@ -114,24 +115,22 @@ Start by following the steps in [Development Environment](#development-environme
 Then, you can run the tests and the perlcritic linter together with:
 
 ```console
-$ nix develop
-$ ninja -C build test
+$ nix-shell
+$ make check
 ```
 
 You can run a single test with:
 
 ```
-$ nix develop
-$ cd build
-$ meson test --test-args=../t/Hydra/Event.t testsuite
+$ nix-shell
+$ yath test ./t/foo/bar.t
 ```
 
 And you can run just perlcritic with:
 
 ```
-$ nix develop
-$ cd build
-$ meson test perlcritic
+$ nix-shell
+$ make perlcritic
 ```
 
 ### JSON API

doc/manual/src/configuration.md

@@ -63,7 +63,8 @@ following:
         .. other configuration ..
         location /hydra/ {
 
-            proxy_pass http://127.0.0.1:3000/;
+            proxy_pass     http://127.0.0.1:3000;
+            proxy_redirect http://127.0.0.1:3000 https://example.com/hydra;
 
             proxy_set_header  Host              $host;
             proxy_set_header  X-Real-IP         $remote_addr;
@@ -73,9 +74,6 @@ following:
         }
     }
 
-Note the trailing slash on the `proxy_pass` directive, which causes nginx to
-strip off the `/hydra/` part of the URL before passing it to hydra.
-
 Populating a Cache
 ------------------
 

doc/manual/src/hacking.md

@@ -11,6 +11,12 @@ $ cd hydra
 To enter a shell in which all environment variables (such as `PERL5LIB`)
 and dependencies can be found:
 
+```console
+$ nix-shell
+```
+
+of when flakes are enabled:
+
 ```console
 $ nix develop
 ```
@@ -18,15 +24,15 @@ $ nix develop
 To build Hydra, you should then do:
 
 ```console
-$ mesonConfigurePhase
-$ ninja
+[nix-shell]$ autoreconfPhase
+[nix-shell]$ configurePhase
+[nix-shell]$ make -j$(nproc)
 ```
 
 You start a local database, the webserver, and other components with
 foreman:
 
 ```console
-$ ninja -C build
 $ foreman start
 ```
 
@@ -41,11 +47,18 @@ $ ./src/script/hydra-server
 You can run Hydra's test suite with the following:
 
 ```console
-$ meson test
-# to run as many tests as you have cores:
-$ YATH_JOB_COUNT=$NIX_BUILD_CORES meson test
+[nix-shell]$ make check
+[nix-shell]$ # to run as many tests as you have cores:
+[nix-shell]$ make check YATH_JOB_COUNT=$NIX_BUILD_CORES
+[nix-shell]$ # or run yath directly:
+[nix-shell]$ yath test
+[nix-shell]$ # to run as many tests as you have cores:
+[nix-shell]$ yath test -j $NIX_BUILD_CORES
 ```
 
+When using `yath` instead of `make check`, ensure you have run `make`
+in the root of the repository at least once.
+
 **Warning**: Currently, the tests can fail
 if run with high parallelism [due to an issue in
 `Test::PostgreSQL`](https://github.com/TJC/Test-postgresql/issues/40)
@@ -62,7 +75,7 @@ will reload the page every time you save.
 To build Hydra and its dependencies:
 
 ```console
-$ nix build .#packages.x86_64-linux.default
+$ nix-build release.nix -A build.x86_64-linux
 ```
 
 ## Development Tasks

doc/manual/src/plugins/README.md

@@ -92,23 +92,6 @@ Sets Gitea CI status
 
 - `gitea_authorization.<repo-owner>`
 
-## Gitea pulls
-
-Create jobs based on open Gitea pull requests
-
-### Configuration options
-
-- `gitea_authorization.<repo-owner>`
-
-## Gitea refs
-
-Hydra plugin for retrieving the list of references (branches or tags) from
-Gitea following a certain naming scheme.
-
-### Configuration options
-
-- `gitea_authorization.<repo-owner>`
-
 ## GitHub pulls
 
 Create jobs based on open GitHub pull requests

flake.lock

@@ -1,18 +1,27 @@
 {
   "nodes": {
     "nix": {
-      "flake": false,
+      "inputs": {
+        "flake-compat": [],
+        "flake-parts": [],
+        "git-hooks-nix": [],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-23-11": [],
+        "nixpkgs-regression": []
+      },
       "locked": {
-        "lastModified": 1748154947,
-        "narHash": "sha256-rCpANMHFIlafta6J/G0ILRd+WNSnzv/lzi40Y8f1AR8=",
+        "lastModified": 1739899400,
+        "narHash": "sha256-q/RgA4bB7zWai4oPySq9mch7qH14IEeom2P64SXdqHs=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "d761dad79c79af17aa476a29749bd9d69747548f",
+        "rev": "e310c19a1aeb1ce1ed4d41d5ab2d02db596e0918",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "2.29-maintenance",
+        "ref": "2.26-maintenance",
         "repo": "nix",
         "type": "github"
       }
@@ -20,11 +29,11 @@
     "nix-eval-jobs": {
       "flake": false,
       "locked": {
-        "lastModified": 1748211873,
-        "narHash": "sha256-AJ22q6yWc1hPkqssXMxQqD6QUeJ6hbx52xWHhKsmuP0=",
+        "lastModified": 1743008255,
+        "narHash": "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "d9262e535e35454daebcebd434bdb9c1486bb998",
+        "rev": "f7418fc1fa45b96d37baa95ff3c016dd5be3876b",
         "type": "github"
       },
       "original": {
@@ -35,16 +44,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748124805,
-        "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=",
+        "lastModified": 1739461644,
+        "narHash": "sha256-1o1qR0KYozYGRrnqytSpAhVBYLNBHX+Lv6I39zGRzKM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93",
+        "rev": "97a719c9f0a07923c957cf51b20b329f9fb9d43f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05-small",
+        "ref": "nixos-24.11-small",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,12 +1,18 @@
 {
   description = "A Nix-based continuous build system";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
 
   inputs.nix = {
-    url = "github:NixOS/nix/2.29-maintenance";
-    # We want to control the deps precisely
-    flake = false;
+    url = "github:NixOS/nix/2.26-maintenance";
+    inputs.nixpkgs.follows = "nixpkgs";
+
+    # hide nix dev tooling from our lock file
+    inputs.flake-parts.follows = "";
+    inputs.git-hooks-nix.follows = "";
+    inputs.nixpkgs-regression.follows = "";
+    inputs.nixpkgs-23-11.follows = "";
+    inputs.flake-compat.follows = "";
   };
 
   inputs.nix-eval-jobs = {
@@ -24,27 +30,11 @@
 
       # A Nixpkgs overlay that provides a 'hydra' package.
       overlays.default = final: prev: {
-        nixDependenciesForHydra = final.lib.makeScope final.newScope
-          (import (nix + "/packaging/dependencies.nix") {
-            pkgs = final;
-            inherit (final) stdenv;
-            inputs = {};
-          });
-        nixComponentsForHydra = final.lib.makeScope final.nixDependenciesForHydra.newScope
-          (import (nix + "/packaging/components.nix") {
-            officialRelease = true;
-            inherit (final) lib;
-            pkgs = final;
-            src = nix;
-            maintainers = [ ];
-          });
-        nix-eval-jobs = final.callPackage nix-eval-jobs {
-          nixComponents = final.nixComponentsForHydra;
-        };
+        nix-eval-jobs = final.callPackage nix-eval-jobs {};
         hydra = final.callPackage ./package.nix {
-          inherit (final.lib) fileset;
+          inherit (nixpkgs.lib) fileset;
           rawSrc = self;
-          nixComponents = final.nixComponentsForHydra;
+          nix-perl-bindings = final.nixComponents.nix-perl-bindings;
         };
       };
 
@@ -83,31 +73,21 @@
         validate-openapi = hydraJobs.tests.validate-openapi.${system};
       });
 
-      packages = forEachSystem (system: let
-        inherit (nixpkgs) lib;
-        pkgs = nixpkgs.legacyPackages.${system};
-        nixDependencies = lib.makeScope pkgs.newScope
-          (import (nix + "/packaging/dependencies.nix") {
-            inherit pkgs;
-            inherit (pkgs) stdenv;
-            inputs = {};
-          });
-        nixComponents = lib.makeScope nixDependencies.newScope
-          (import (nix + "/packaging/components.nix") {
-            officialRelease = true;
-            inherit lib pkgs;
-            src = nix;
-            maintainers = [ ];
-          });
-      in {
-        nix-eval-jobs = pkgs.callPackage nix-eval-jobs {
-          inherit nixComponents;
+      packages = forEachSystem (system: {
+        nix-eval-jobs = nixpkgs.legacyPackages.${system}.callPackage nix-eval-jobs {
+          nix = nix.packages.${system}.nix;
         };
-        hydra = pkgs.callPackage ./package.nix {
+        hydra = nixpkgs.legacyPackages.${system}.callPackage ./package.nix {
           inherit (nixpkgs.lib) fileset;
-          inherit nixComponents;
           inherit (self.packages.${system}) nix-eval-jobs;
           rawSrc = self;
+          inherit (nix.packages.${system})
+            nix-util
+            nix-store
+            nix-main
+            nix-cli
+            ;
+          nix-perl-bindings = nix.hydraJobs.perlBindings.${system};
         };
         default = self.packages.${system}.hydra;
       });

hydra/jobsets.nix

@@ -1,90 +0,0 @@
-{ pulls, branches, ... }:
-let
-  # create the json spec for the jobset
-  makeSpec =
-    contents:
-    builtins.derivation {
-      name = "spec.json";
-      system = "x86_64-linux";
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-      builder = "/bin/sh";
-      args = [
-        (builtins.toFile "builder.sh" ''
-          echo "$contents" > $out
-        '')
-      ];
-      contents = builtins.toJSON contents;
-    };
-
-  prs = readJSONFile pulls;
-  refs = readJSONFile branches;
-
-  # template for creating a job
-  makeJob =
-    {
-      schedulingshares ? 10,
-      keepnr ? 3,
-      description,
-      flake,
-      enabled ? 1,
-    }:
-    {
-      inherit
-        description
-        flake
-        schedulingshares
-        keepnr
-        enabled
-        ;
-      type = 1;
-      hidden = false;
-      checkinterval = 300; # every 5 minutes
-      enableemail = false;
-      emailoverride = "";
-    };
-
-  giteaHost = "ssh://gitea@nayeonie.com:2222";
-  repo = "ahuston-0/hydra";
-  # # Create a hydra job for a branch
-  jobOfRef =
-    name:
-    { ref, ... }:
-    if ((builtins.match "^refs/heads/(.*)$" ref) == null) then
-      null
-    else
-      {
-        name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}";
-        value = makeJob {
-          description = "Branch ${name}";
-          flake = "git+${giteaHost}/${repo}?ref=${ref}";
-        };
-      };
-
-  # Create a hydra job for a PR
-  jobOfPR = id: info: {
-    name = if info.draft then "draft-${id}" else "pr-${id}";
-    value = makeJob {
-      description = "PR ${id}: ${info.title}";
-      flake = "git+${giteaHost}/${repo}?ref=${info.head.ref}";
-      enabled = info.state == "open";
-    };
-  };
-
-  # some utility functions
-  # converts json to name/value dicts
-  attrsToList = l: builtins.attrValues (builtins.mapAttrs (name: value: { inherit name value; }) l);
-  # wrapper function for reading json from file
-  readJSONFile = f: builtins.fromJSON (builtins.readFile f);
-  # remove null values from a set, in-case of branches that don't exist
-  mapFilter = f: l: builtins.filter (x: (x != null)) (map f l);
-
-  # Create job set from PRs and branches
-  jobs = makeSpec (
-    builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs))
-    // builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs))
-  );
-in
-{
-  jobsets = jobs;
-}

hydra/spec.json

@@ -1,35 +0,0 @@
-{
-  "enabled": 1,
-  "hidden": false,
-  "description": "ahuston-0's fork of hydra",
-  "nixexprinput": "nixexpr",
-  "nixexprpath": "hydra/jobsets.nix",
-  "checkinterval": 60,
-  "schedulingshares": 100,
-  "enableemail": false,
-  "emailoverride": "",
-  "keepnr": 3,
-  "type": 0,
-  "inputs": {
-    "nixexpr": {
-      "value": "ssh://gitea@nayeonie.com:2222/ahuston-0/hydra.git add-gitea-pulls",
-      "type": "git",
-      "emailresponsible": false
-    },
-    "nixpkgs": {
-      "value": "https://github.com/NixOS/nixpkgs nixos-unstable",
-      "type": "git",
-      "emailresponsible": false
-    },
-    "pulls": {
-      "type": "giteapulls",
-      "value": "nayeonie.com ahuston-0 hydra https",
-      "emailresponsible": false
-    },
-    "branches": {
-      "type": "gitea_refs",
-      "value": "nayeonie.com ahuston-0 hydra heads https -",
-      "emailresponsible": false
-    }
-  }
-}

meson.build

@@ -12,6 +12,20 @@ nix_util_dep = dependency('nix-util', required: true)
 nix_store_dep = dependency('nix-store', required: true)
 nix_main_dep = dependency('nix-main', required: true)
 
+# Nix need extra flags not provided in its pkg-config files.
+nix_dep = declare_dependency(
+  dependencies: [
+    nix_util_dep,
+    nix_store_dep,
+    nix_main_dep,
+  ],
+  compile_args: [
+    '-include', 'nix/config-util.hh',
+    '-include', 'nix/config-store.hh',
+    '-include', 'nix/config-main.hh',
+  ],
+)
+
 pqxx_dep = dependency('libpqxx', required: true)
 
 prom_cpp_core_dep = dependency('prometheus-cpp-core', required: true)

nixos-modules/hydra.nix

@@ -228,8 +228,8 @@ in
 
     nix.settings = {
       trusted-users = [ "hydra-queue-runner" ];
-      keep-outputs = true;
-      keep-derivations = true;
+      gc-keep-outputs = true;
+      gc-keep-derivations = true;
     };
 
     services.hydra-dev.extraConfig =

nixos-tests.nix

@@ -27,7 +27,8 @@ in
 {
 
   install = forEachSystem (system:
-    (import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; }).simpleTest {
+    with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; };
+    simpleTest {
       name = "hydra-install";
       nodes.machine = hydraServer;
       testScript =
@@ -42,7 +43,8 @@ in
     });
 
   notifications = forEachSystem (system:
-    (import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; }).simpleTest {
+    with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; };
+    simpleTest {
       name = "hydra-notifications";
       nodes.machine = {
         imports = [ hydraServer ];
@@ -54,7 +56,7 @@ in
         '';
         services.influxdb.enable = true;
       };
-      testScript = { nodes, ... }: ''
+      testScript = ''
         machine.wait_for_job("hydra-init")
 
         # Create an admin account and some other state.
@@ -85,7 +87,7 @@ in
 
         # Setup the project and jobset
         machine.succeed(
-            "su - hydra -c 'perl -I ${nodes.machine.services.hydra-dev.package.perlDeps}/lib/perl5/site_perl ${./t/setup-notifications-jobset.pl}' >&2"
+            "su - hydra -c 'perl -I ${config.services.hydra-dev.package.perlDeps}/lib/perl5/site_perl ${./t/setup-notifications-jobset.pl}' >&2"
         )
 
         # Wait until hydra has build the job and
@@ -99,10 +101,9 @@ in
     });
 
   gitea = forEachSystem (system:
-    let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in
-    (import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; }).makeTest {
+    let pkgs = nixpkgs.legacyPackages.${system}; in
+    with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; };
+    makeTest {
       name = "hydra-gitea";
       nodes.machine = { pkgs, ... }: {
         imports = [ hydraServer ];
@@ -144,24 +145,10 @@ in
             git -C /tmp/repo add .
             git config --global user.email test@localhost
             git config --global user.name test
-
-            # Create initial commit
             git -C /tmp/repo commit -m 'Initial import'
             git -C /tmp/repo remote add origin gitea@machine:root/repo
-            export GIT_SSH_COMMAND='ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no'
-            git -C /tmp/repo push origin master
-            git -C /tmp/repo log >&2
-
-            # Create PR branch
-            git -C /tmp/repo checkout -b pr
-            git -C /tmp/repo commit --allow-empty -m 'Additional change'
-            git -C /tmp/repo push origin pr
-            git -C /tmp/repo log >&2
-
-            # Create release branch
-            git -C /tmp/repo checkout -b release/release-1.0
-            git -C /tmp/repo commit --allow-empty -m 'Additional change'
-            git -C /tmp/repo push origin release/release-1.0
+            GIT_SSH_COMMAND='ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no' \
+              git -C /tmp/repo push origin master
             git -C /tmp/repo log >&2
           '';
 
@@ -198,7 +185,7 @@ in
             cat >data.json <<EOF
             {
               "description": "Trivial",
-              "checkinterval": "20",
+              "checkinterval": "60",
               "enabled": "1",
               "visible": "1",
               "keepnr": "1",
@@ -212,17 +199,7 @@ in
                 "gitea_repo_name": {"value": "repo", "type": "string"},
                 "gitea_repo_owner": {"value": "root", "type": "string"},
                 "gitea_status_repo": {"value": "git", "type": "string"},
-                "gitea_http_url": {"value": "http://localhost:3001", "type": "string"},
-                "pulls": {
-                  "type": "giteapulls",
-                  "value": "localhost:3001 root repo http",
-                  "emailresponsible": false
-                },
-                "releases": {
-                  "type": "gitea_refs",
-                  "value": "localhost:3001 root repo heads http - release",
-                  "emailresponseible": false
-                }
+                "gitea_http_url": {"value": "http://localhost:3001", "type": "string"}
               }
             }
             EOF
@@ -250,41 +227,15 @@ in
           };
 
           smallDrv = pkgs.writeText "jobset.nix" ''
-            { pulls, releases, ... }:
-
-            let
-              genDrv = name: builtins.derivation {
-                 inherit name;
-                 system = "${system}";
-                 builder = "/bin/sh";
-                 allowSubstitutes = false;
-                 preferLocalBuild = true;
-                 args = ["-c" "echo success > $out; exit 0"];
+            { trivial = builtins.derivation {
+                name = "trivial";
+                system = "${system}";
+                builder = "/bin/sh";
+                allowSubstitutes = false;
+                preferLocalBuild = true;
+                args = ["-c" "echo success > $out; exit 0"];
               };
-
-              prs = builtins.fromJSON (builtins.readFile pulls);
-              prJobNames = map (n: "pr-''${n}") (builtins.attrNames prs);
-              prJobset = builtins.listToAttrs (
-                map (
-                  name: {
-                    inherit name;
-                    value = genDrv name;
-                  }
-                ) prJobNames
-              );
-              rels = builtins.fromJSON (builtins.readFile releases);
-              relJobNames = builtins.attrNames rels;
-              relJobset = builtins.listToAttrs (
-                map (
-                  name: {
-                    inherit name;
-                    value = genDrv name;
-                  }
-                ) relJobNames
-              );
-            in {
-              trivial = genDrv "trivial";
-            } // prJobset // relJobset
+             }
           '';
         in
         ''
@@ -328,34 +279,18 @@ in
               + '|  jq .buildstatus | xargs test 0 -eq'
           )
 
-          machine.sleep(3)
-
           data = machine.succeed(
-              'curl -Lf -s "http://localhost:3001/api/v1/repos/root/repo/statuses/$(cd /tmp/repo && git show master | head -n1 | awk "{print \\$2}")?sort=leastindex" '
+              'curl -Lf -s "http://localhost:3001/api/v1/repos/root/repo/statuses/$(cd /tmp/repo && git show | head -n1 | awk "{print \\$2}")" '
               + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
               + f"-H 'Authorization: token ${api_token}'"
           )
 
           response = json.loads(data)
 
-          assert len(response) == 2, "Expected exactly two status updates for latest commit (queued, finished)!"
+          assert len(response) == 2, "Expected exactly three status updates for latest commit (queued, finished)!"
           assert response[0]['status'] == "success", "Expected finished status to be success!"
           assert response[1]['status'] == "pending", "Expected queued status to be pending!"
 
-          # giteapulls test
-
-          machine.succeed(
-              "curl --fail -X POST http://localhost:3001/api/v1/repos/root/repo/pulls "
-              + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
-              + f"-H 'Authorization: token ${api_token}'"
-              + ' -d \'{"title":"Test PR", "base":"master", "head": "pr"}\'''
-          )
-
-          machine.wait_until_succeeds(
-              'curl -Lf -s http://localhost:3000/build/2 -H "Accept: application/json" '
-              + '|  jq .buildstatus | xargs test 0 -eq'
-          )
-
           machine.shutdown()
         '';
     });

package.nix

@@ -8,7 +8,11 @@
 
 , perlPackages
 
-, nixComponents
+, nix-util
+, nix-store
+, nix-main
+, nix-cli
+, nix-perl-bindings
 , git
 
 , makeWrapper
@@ -61,7 +65,7 @@ let
     name = "hydra-perl-deps";
     paths = lib.closePropagation
       ([
-        nixComponents.nix-perl-bindings
+        nix-perl-bindings
         git
       ] ++ (with perlPackages; [
         AuthenSASL
@@ -89,7 +93,6 @@ let
         DateTime
         DBDPg
         DBDSQLite
-        DBIxClassHelpers
         DigestSHA1
         EmailMIME
         EmailSender
@@ -162,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
     nukeReferences
     pkg-config
     mdbook
-    nixComponents.nix-cli
+    nix-cli
     perlDeps
     perl
     unzip
@@ -172,9 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
     libpqxx
     openssl
     libxslt
-    nixComponents.nix-util
-    nixComponents.nix-store
-    nixComponents.nix-main
+    nix-util
+    nix-store
+    nix-main
     perlDeps
     perl
     boost
@@ -201,14 +204,14 @@ stdenv.mkDerivation (finalAttrs: {
     glibcLocales
     libressl.nc
     python3
-    nixComponents.nix-cli
+    nix-cli
   ];
 
   hydraPath = lib.makeBinPath (
     [
       subversion
       openssh
-      nixComponents.nix-cli
+      nix-cli
       coreutils
       findutils
       pixz
@@ -238,7 +241,7 @@ stdenv.mkDerivation (finalAttrs: {
   shellHook = ''
     pushd $(git rev-parse --show-toplevel) >/dev/null
 
-    PATH=$(pwd)/build/src/hydra-evaluator:$(pwd)/build/src/script:$(pwd)/build/src/hydra-queue-runner:$PATH
+    PATH=$(pwd)/src/hydra-evaluator:$(pwd)/src/script:$(pwd)/src/hydra-queue-runner:$PATH
     PERL5LIB=$(pwd)/src/lib:$PERL5LIB
     export HYDRA_HOME="$(pwd)/src/"
     mkdir -p .hydra-data
@@ -269,7 +272,7 @@ stdenv.mkDerivation (finalAttrs: {
             --prefix PATH ':' $out/bin:$hydraPath \
             --set HYDRA_RELEASE ${version} \
             --set HYDRA_HOME $out/libexec/hydra \
-            --set NIX_RELEASE ${nixComponents.nix-cli.name or "unknown"} \
+            --set NIX_RELEASE ${nix-cli.name or "unknown"} \
             --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"}
     done
   '';
@@ -277,8 +280,5 @@ stdenv.mkDerivation (finalAttrs: {
   dontStrip = true;
 
   meta.description = "Build of Hydra on ${stdenv.system}";
-  passthru = {
-    inherit perlDeps;
-    nix = nixComponents.nix-cli;
-  };
+  passthru = { inherit perlDeps; };
 })

src/hydra-evaluator/hydra-evaluator.cc

@@ -1,8 +1,8 @@
 #include "db.hh"
 #include "hydra-config.hh"
-#include <nix/util/pool.hh>
-#include <nix/main/shared.hh>
-#include <nix/util/signals.hh>
+#include "pool.hh"
+#include "shared.hh"
+#include "signals.hh"
 
 #include <algorithm>
 #include <thread>

src/hydra-evaluator/meson.build

@@ -2,8 +2,7 @@ hydra_evaluator = executable('hydra-evaluator',
   'hydra-evaluator.cc',
   dependencies: [
     libhydra_dep,
-    nix_util_dep,
-    nix_main_dep,
+    nix_dep,
     pqxx_dep,
   ],
   install: true,

src/hydra-queue-runner/build-remote.cc

@@ -5,20 +5,20 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <nix/store/build-result.hh>
-#include <nix/store/path.hh>
-#include <nix/store/legacy-ssh-store.hh>
-#include <nix/store/serve-protocol.hh>
-#include <nix/store/serve-protocol-impl.hh>
+#include "build-result.hh"
+#include "path.hh"
+#include "legacy-ssh-store.hh"
+#include "serve-protocol.hh"
+#include "serve-protocol-impl.hh"
 #include "state.hh"
-#include <nix/util/current-process.hh>
-#include <nix/util/processes.hh>
-#include <nix/util/util.hh>
-#include <nix/store/serve-protocol.hh>
-#include <nix/store/serve-protocol-impl.hh>
-#include <nix/store/ssh.hh>
-#include <nix/util/finally.hh>
-#include <nix/util/url.hh>
+#include "current-process.hh"
+#include "processes.hh"
+#include "util.hh"
+#include "serve-protocol.hh"
+#include "serve-protocol-impl.hh"
+#include "ssh.hh"
+#include "finally.hh"
+#include "url.hh"
 
 using namespace nix;
 
@@ -50,7 +50,7 @@ static std::unique_ptr<SSHMaster::Connection> openConnection(
         auto remoteStore = machine->storeUri.params.find("remote-store");
         if (remoteStore != machine->storeUri.params.end()) {
             command.push_back("--store");
-            command.push_back(escapeShellArgAlways(remoteStore->second));
+            command.push_back(shellEscape(remoteStore->second));
         }
     }
 
@@ -386,19 +386,8 @@ void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult)
 
 }
 
-/* Utility guard object to auto-release a semaphore on destruction. */
-template <typename T>
-class SemaphoreReleaser {
-public:
-    SemaphoreReleaser(T* s) : sem(s) {}
-    ~SemaphoreReleaser() { sem->release(); }
-
-private:
-    T* sem;
-};
 
 void State::buildRemote(ref<Store> destStore,
-    std::unique_ptr<MachineReservation> reservation,
     ::Machine::ptr machine, Step::ptr step,
     const ServeProto::BuildOptions & buildOptions,
     RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
@@ -538,23 +527,6 @@ void State::buildRemote(ref<Store> destStore,
             result.logFile = "";
         }
 
-        /* Throttle CPU-bound work. Opportunistically skip updating the current
-         * step, since this requires a DB roundtrip. */
-        if (!localWorkThrottler.try_acquire()) {
-            MaintainCount<counter> mc(nrStepsWaitingForDownloadSlot);
-            updateStep(ssWaitingForLocalSlot);
-            localWorkThrottler.acquire();
-        }
-        SemaphoreReleaser releaser(&localWorkThrottler);
-
-        /* Once we've started copying outputs, release the machine reservation
-         * so further builds can happen. We do not release the machine earlier
-         * to avoid situations where the queue runner is bottlenecked on
-         * copying outputs and we end up building too many things that we
-         * haven't been able to allow copy slots for. */
-        reservation.reset();
-        wakeDispatcher();
-
         StorePathSet outputs;
         for (auto & [_, realisation] : buildResult.builtOutputs)
             outputs.insert(realisation.outPath);

src/hydra-queue-runner/build-result.cc

@@ -1,7 +1,7 @@
 #include "hydra-build-result.hh"
-#include <nix/store/store-api.hh>
-#include <nix/util/util.hh>
-#include <nix/util/source-accessor.hh>
+#include "store-api.hh"
+#include "util.hh"
+#include "source-accessor.hh"
 
 #include <regex>
 

src/hydra-queue-runner/builder.cc

@@ -2,8 +2,8 @@
 
 #include "state.hh"
 #include "hydra-build-result.hh"
-#include <nix/util/finally.hh>
-#include <nix/store/binary-cache-store.hh>
+#include "finally.hh"
+#include "binary-cache-store.hh"
 
 using namespace nix;
 
@@ -16,7 +16,7 @@ void setThreadName(const std::string & name)
 }
 
 
-void State::builder(std::unique_ptr<MachineReservation> reservation)
+void State::builder(MachineReservation::ptr reservation)
 {
     setThreadName("bld~" + std::string(reservation->step->drvPath.to_string()));
 
@@ -35,20 +35,22 @@ void State::builder(std::unique_ptr<MachineReservation> reservation)
             activeSteps_.lock()->erase(activeStep);
         });
 
-        std::string machine = reservation->machine->storeUri.render();
-
         try {
             auto destStore = getDestStore();
-            // Might release the reservation.
-            res = doBuildStep(destStore, std::move(reservation), activeStep);
+            res = doBuildStep(destStore, reservation, activeStep);
         } catch (std::exception & e) {
             printMsg(lvlError, "uncaught exception building ‘%s’ on ‘%s’: %s",
-                localStore->printStorePath(activeStep->step->drvPath),
-                machine,
+                localStore->printStorePath(reservation->step->drvPath),
+                reservation->machine->storeUri.render(),
                 e.what());
         }
     }
 
+    /* Release the machine and wake up the dispatcher. */
+    assert(reservation.unique());
+    reservation = 0;
+    wakeDispatcher();
+
     /* If there was a temporary failure, retry the step after an
        exponentially increasing interval. */
     Step::ptr step = wstep.lock();
@@ -70,11 +72,11 @@ void State::builder(std::unique_ptr<MachineReservation> reservation)
 
 
 State::StepResult State::doBuildStep(nix::ref<Store> destStore,
-    std::unique_ptr<MachineReservation> reservation,
+    MachineReservation::ptr reservation,
     std::shared_ptr<ActiveStep> activeStep)
 {
-    auto step(reservation->step);
-    auto machine(reservation->machine);
+    auto & step(reservation->step);
+    auto & machine(reservation->machine);
 
     {
         auto step_(step->state.lock());
@@ -209,7 +211,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
         try {
             /* FIXME: referring builds may have conflicting timeouts. */
-            buildRemote(destStore, std::move(reservation), machine, step, buildOptions, result, activeStep, updateStep, narMembers);
+            buildRemote(destStore, machine, step, buildOptions, result, activeStep, updateStep, narMembers);
         } catch (Error & e) {
             if (activeStep->state_.lock()->cancelled) {
                 printInfo("marking step %d of build %d as cancelled", stepNr, buildId);

src/hydra-queue-runner/dispatcher.cc

@@ -40,15 +40,13 @@ void State::dispatcher()
             printMsg(lvlDebug, "dispatcher woken up");
             nrDispatcherWakeups++;
 
-            auto t_before_work = std::chrono::steady_clock::now();
+            auto now1 = std::chrono::steady_clock::now();
 
             auto sleepUntil = doDispatch();
 
-            auto t_after_work = std::chrono::steady_clock::now();
+            auto now2 = std::chrono::steady_clock::now();
 
-            prom.dispatcher_time_spent_running.Increment(
-                std::chrono::duration_cast<std::chrono::microseconds>(t_after_work - t_before_work).count());
-            dispatchTimeMs += std::chrono::duration_cast<std::chrono::milliseconds>(t_after_work - t_before_work).count();
+            dispatchTimeMs += std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();
 
             /* Sleep until we're woken up (either because a runnable build
                is added, or because a build finishes). */
@@ -62,10 +60,6 @@ void State::dispatcher()
                 *dispatcherWakeup_ = false;
             }
 
-            auto t_after_sleep = std::chrono::steady_clock::now();
-            prom.dispatcher_time_spent_waiting.Increment(
-                std::chrono::duration_cast<std::chrono::microseconds>(t_after_sleep - t_after_work).count());
-
         } catch (std::exception & e) {
             printError("dispatcher: %s", e.what());
             sleep(1);
@@ -134,8 +128,6 @@ system_time State::doDispatch()
            comparator is a partial ordering (see MachineInfo). */
         int highestGlobalPriority;
         int highestLocalPriority;
-        size_t numRequiredSystemFeatures;
-        size_t numRevDeps;
         BuildID lowestBuildID;
 
         StepInfo(Step::ptr step, Step::State & step_) : step(step)
@@ -144,8 +136,6 @@ system_time State::doDispatch()
                 lowestShareUsed = std::min(lowestShareUsed, jobset->shareUsed());
             highestGlobalPriority = step_.highestGlobalPriority;
             highestLocalPriority = step_.highestLocalPriority;
-            numRequiredSystemFeatures = step->requiredSystemFeatures.size();
-            numRevDeps = step_.rdeps.size();
             lowestBuildID = step_.lowestBuildID;
         }
     };
@@ -198,8 +188,6 @@ system_time State::doDispatch()
                 a.highestGlobalPriority != b.highestGlobalPriority ? a.highestGlobalPriority > b.highestGlobalPriority :
                 a.lowestShareUsed != b.lowestShareUsed ? a.lowestShareUsed < b.lowestShareUsed :
                 a.highestLocalPriority != b.highestLocalPriority ? a.highestLocalPriority > b.highestLocalPriority :
-                a.numRequiredSystemFeatures != b.numRequiredSystemFeatures ? a.numRequiredSystemFeatures > b.numRequiredSystemFeatures :
-                a.numRevDeps != b.numRevDeps ? a.numRevDeps > b.numRevDeps :
                 a.lowestBuildID < b.lowestBuildID;
         });
 
@@ -294,7 +282,7 @@ system_time State::doDispatch()
                 /* Make a slot reservation and start a thread to
                    do the build. */
                 auto builderThread = std::thread(&State::builder, this,
-                    std::make_unique<MachineReservation>(*this, step, mi.machine));
+                    std::make_shared<MachineReservation>(*this, step, mi.machine));
                 builderThread.detach(); // FIXME?
 
                 keepGoing = true;

src/hydra-queue-runner/hydra-build-result.hh

@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include <nix/util/hash.hh>
-#include <nix/store/derivations.hh>
-#include <nix/store/store-api.hh>
+#include "hash.hh"
+#include "derivations.hh"
+#include "store-api.hh"
 #include "nar-extractor.hh"
 
 struct BuildProduct

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -11,16 +11,16 @@
 
 #include <nlohmann/json.hpp>
 
-#include <nix/util/signals.hh>
+#include "signals.hh"
 #include "state.hh"
 #include "hydra-build-result.hh"
-#include <nix/store/store-open.hh>
-#include <nix/store/remote-store.hh>
+#include "store-api.hh"
+#include "remote-store.hh"
 
-#include <nix/store/globals.hh>
+#include "globals.hh"
 #include "hydra-config.hh"
-#include <nix/store/s3-binary-cache-store.hh>
-#include <nix/main/shared.hh>
+#include "s3-binary-cache-store.hh"
+#include "shared.hh"
 
 using namespace nix;
 using nlohmann::json;
@@ -70,31 +70,10 @@ State::PromMetrics::PromMetrics()
             .Register(*registry)
             .Add({})
     )
-    , dispatcher_time_spent_running(
-        prometheus::BuildCounter()
-            .Name("hydraqueuerunner_dispatcher_time_spent_running")
-            .Help("Time (in micros) spent running the dispatcher")
-            .Register(*registry)
-            .Add({})
-    )
-    , dispatcher_time_spent_waiting(
-        prometheus::BuildCounter()
-            .Name("hydraqueuerunner_dispatcher_time_spent_waiting")
-            .Help("Time (in micros) spent waiting for the dispatcher to obtain work")
-            .Register(*registry)
-            .Add({})
-    )
-    , queue_monitor_time_spent_running(
-        prometheus::BuildCounter()
-            .Name("hydraqueuerunner_queue_monitor_time_spent_running")
-            .Help("Time (in micros) spent running the queue monitor")
-            .Register(*registry)
-            .Add({})
-    )
-    , queue_monitor_time_spent_waiting(
-        prometheus::BuildCounter()
-            .Name("hydraqueuerunner_queue_monitor_time_spent_waiting")
-            .Help("Time (in micros) spent waiting for the queue monitor to obtain work")
+    , queue_max_id(
+        prometheus::BuildGauge()
+            .Name("hydraqueuerunner_queue_max_build_id_info")
+            .Help("Maximum build record ID in the queue")
             .Register(*registry)
             .Add({})
     )
@@ -106,7 +85,6 @@ State::State(std::optional<std::string> metricsAddrOpt)
     : config(std::make_unique<HydraConfig>())
     , maxUnsupportedTime(config->getIntOption("max_unsupported_time", 0))
     , dbPool(config->getIntOption("max_db_connections", 128))
-    , localWorkThrottler(config->getIntOption("max_local_worker_threads", std::min(maxSupportedLocalWorkers, std::max(4u, std::thread::hardware_concurrency()) - 2)))
     , maxOutputSize(config->getIntOption("max_output_size", 2ULL << 30))
     , maxLogSize(config->getIntOption("max_log_size", 64ULL << 20))
     , uploadLogsToBinaryCache(config->getBoolOption("upload_logs_to_binary_cache", false))
@@ -573,7 +551,6 @@ void State::dumpStatus(Connection & conn)
         {"nrActiveSteps", activeSteps_.lock()->size()},
         {"nrStepsBuilding", nrStepsBuilding.load()},
         {"nrStepsCopyingTo", nrStepsCopyingTo.load()},
-        {"nrStepsWaitingForDownloadSlot", nrStepsWaitingForDownloadSlot.load()},
         {"nrStepsCopyingFrom", nrStepsCopyingFrom.load()},
         {"nrStepsWaiting", nrStepsWaiting.load()},
         {"nrUnsupportedSteps", nrUnsupportedSteps.load()},
@@ -615,7 +592,6 @@ void State::dumpStatus(Connection & conn)
         }
 
         {
-            auto machines_json = json::object();
             auto machines_(machines.lock());
             for (auto & i : *machines_) {
                 auto & m(i.second);
@@ -642,9 +618,8 @@ void State::dumpStatus(Connection & conn)
                     machine["avgStepTime"] = (float) s->totalStepTime / s->nrStepsDone;
                     machine["avgStepBuildTime"] = (float) s->totalStepBuildTime / s->nrStepsDone;
                 }
-                machines_json[m->storeUri.render()] = machine;
+                statusJson["machines"][m->storeUri.render()] = machine;
             }
-            statusJson["machines"] = machines_json;
         }
 
         {
@@ -703,7 +678,6 @@ void State::dumpStatus(Connection & conn)
             : 0.0},
         };
 
-#if NIX_WITH_S3_SUPPORT
         auto s3Store = dynamic_cast<S3BinaryCacheStore *>(&*store);
         if (s3Store) {
             auto & s3Stats = s3Store->getS3Stats();
@@ -729,7 +703,6 @@ void State::dumpStatus(Connection & conn)
                         + s3Stats.getBytes / (1024.0 * 1024.0 * 1024.0) * 0.09},
             };
         }
-#endif
     }
 
     {
@@ -832,7 +805,7 @@ void State::run(BuildID buildOne)
         << metricsAddr << "/metrics (port " << exposerPort << ")"
         << std::endl;
 
-    Store::Config::Params localParams;
+    Store::Params localParams;
     localParams["max-connections"] = "16";
     localParams["max-connection-age"] = "600";
     localStore = openStore(getEnv("NIX_REMOTE").value_or(""), localParams);

src/hydra-queue-runner/meson.build

@@ -13,9 +13,7 @@ hydra_queue_runner = executable('hydra-queue-runner',
   srcs,
   dependencies: [
     libhydra_dep,
-    nix_util_dep,
-    nix_store_dep,
-    nix_main_dep,
+    nix_dep,
     pqxx_dep,
     prom_cpp_core_dep,
     prom_cpp_pull_dep,

src/hydra-queue-runner/nar-extractor.cc

@@ -1,6 +1,6 @@
 #include "nar-extractor.hh"
 
-#include <nix/util/archive.hh>
+#include "archive.hh"
 
 #include <unordered_set>
 

src/hydra-queue-runner/nar-extractor.hh

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <nix/util/source-accessor.hh>
-#include <nix/util/types.hh>
-#include <nix/util/serialise.hh>
-#include <nix/util/hash.hh>
+#include "source-accessor.hh"
+#include "types.hh"
+#include "serialise.hh"
+#include "hash.hh"
 
 struct NarMemberData
 {

src/hydra-queue-runner/queue-monitor.cc

@@ -1,8 +1,6 @@
 #include "state.hh"
 #include "hydra-build-result.hh"
-#include <nix/store/globals.hh>
-#include <nix/store/parsed-derivations.hh>
-#include <nix/util/thread-pool.hh>
+#include "globals.hh"
 
 #include <cstring>
 
@@ -39,21 +37,16 @@ void State::queueMonitorLoop(Connection & conn)
 
     auto destStore = getDestStore();
 
+    unsigned int lastBuildId = 0;
+
     bool quit = false;
     while (!quit) {
-        auto t_before_work = std::chrono::steady_clock::now();
-
         localStore->clearPathInfoCache();
 
-        bool done = getQueuedBuilds(conn, destStore);
+        bool done = getQueuedBuilds(conn, destStore, lastBuildId);
 
         if (buildOne && buildOneDone) quit = true;
 
-        auto t_after_work = std::chrono::steady_clock::now();
-
-        prom.queue_monitor_time_spent_running.Increment(
-            std::chrono::duration_cast<std::chrono::microseconds>(t_after_work - t_before_work).count());
-
         /* Sleep until we get notification from the database about an
            event. */
         if (done && !quit) {
@@ -63,10 +56,12 @@ void State::queueMonitorLoop(Connection & conn)
             conn.get_notifs();
 
         if (auto lowestId = buildsAdded.get()) {
+            lastBuildId = std::min(lastBuildId, static_cast<unsigned>(std::stoul(*lowestId) - 1));
             printMsg(lvlTalkative, "got notification: new builds added to the queue");
         }
         if (buildsRestarted.get()) {
             printMsg(lvlTalkative, "got notification: builds restarted");
+            lastBuildId = 0; // check all builds
         }
         if (buildsCancelled.get() || buildsDeleted.get() || buildsBumped.get()) {
             printMsg(lvlTalkative, "got notification: builds cancelled or bumped");
@@ -76,10 +71,6 @@ void State::queueMonitorLoop(Connection & conn)
             printMsg(lvlTalkative, "got notification: jobset shares changed");
             processJobsetSharesChange(conn);
         }
-
-        auto t_after_sleep = std::chrono::steady_clock::now();
-        prom.queue_monitor_time_spent_waiting.Increment(
-            std::chrono::duration_cast<std::chrono::microseconds>(t_after_sleep - t_after_work).count());
     }
 
     exit(0);
@@ -93,18 +84,20 @@ struct PreviousFailure : public std::exception {
 
 
 bool State::getQueuedBuilds(Connection & conn,
-    ref<Store> destStore)
+    ref<Store> destStore, unsigned int & lastBuildId)
 {
     prom.queue_checks_started.Increment();
 
-    printInfo("checking the queue for builds...");
+    printInfo("checking the queue for builds > %d...", lastBuildId);
 
     /* Grab the queued builds from the database, but don't process
        them yet (since we don't want a long-running transaction). */
     std::vector<BuildID> newIDs;
-    std::unordered_map<BuildID, Build::ptr> newBuildsByID;
+    std::map<BuildID, Build::ptr> newBuildsByID;
     std::multimap<StorePath, BuildID> newBuildsByPath;
 
+    unsigned int newLastBuildId = lastBuildId;
+
     {
         pqxx::work txn(conn);
 
@@ -113,12 +106,17 @@ bool State::getQueuedBuilds(Connection & conn,
              "jobsets.name as jobset, job, drvPath, maxsilent, timeout, timestamp, "
              "globalPriority, priority from Builds "
              "inner join jobsets on builds.jobset_id = jobsets.id "
-             "where finished = 0 order by globalPriority desc, random()");
+             "where builds.id > $1 and finished = 0 order by globalPriority desc, builds.id",
+            lastBuildId);
 
         for (auto const & row : res) {
             auto builds_(builds.lock());
             BuildID id = row["id"].as<BuildID>();
             if (buildOne && id != buildOne) continue;
+            if (id > newLastBuildId) {
+                newLastBuildId = id;
+                prom.queue_max_id.Set(id);
+            }
             if (builds_->count(id)) continue;
 
             auto build = std::make_shared<Build>(
@@ -320,13 +318,15 @@ bool State::getQueuedBuilds(Connection & conn,
 
         /* Stop after a certain time to allow priority bumps to be
            processed. */
-        if (std::chrono::system_clock::now() > start + std::chrono::seconds(60)) {
+        if (std::chrono::system_clock::now() > start + std::chrono::seconds(600)) {
             prom.queue_checks_early_exits.Increment();
             break;
         }
     }
 
     prom.queue_checks_finished.Increment();
+
+    lastBuildId = newBuildsByID.empty() ? newLastBuildId : newBuildsByID.begin()->first - 1;
     return newBuildsByID.empty();
 }
 
@@ -405,34 +405,6 @@ void State::processQueueChange(Connection & conn)
 }
 
 
-std::map<DrvOutput, std::optional<StorePath>> State::getMissingRemotePaths(
-    ref<Store> destStore,
-    const std::map<DrvOutput, std::optional<StorePath>> & paths)
-{
-    Sync<std::map<DrvOutput, std::optional<StorePath>>> missing_;
-    ThreadPool tp;
-
-    for (auto & [output, maybeOutputPath] : paths) {
-        if (!maybeOutputPath) {
-            auto missing(missing_.lock());
-            missing->insert({output, maybeOutputPath});
-        } else {
-            tp.enqueue([&] {
-                if (!destStore->isValidPath(*maybeOutputPath)) {
-                    auto missing(missing_.lock());
-                    missing->insert({output, maybeOutputPath});
-                }
-            });
-        }
-    }
-
-    tp.process();
-
-    auto missing(missing_.lock());
-    return *missing;
-}
-
-
 Step::ptr State::createStep(ref<Store> destStore,
     Connection & conn, Build::ptr build, const StorePath & drvPath,
     Build::ptr referringBuild, Step::ptr referringStep, std::set<StorePath> & finishedDrvs,
@@ -491,23 +463,14 @@ Step::ptr State::createStep(ref<Store> destStore,
        it's not runnable yet, and other threads won't make it
        runnable while step->created == false. */
     step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath));
-    {
-        auto parsedOpt = StructuredAttrs::tryParse(step->drv->env);
-        try {
-            step->drvOptions = std::make_unique<DerivationOptions>(
-                DerivationOptions::fromStructuredAttrs(step->drv->env, parsedOpt ? &*parsedOpt : nullptr));
-        } catch (Error & e) {
-            e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath));
-            throw;
-        }
-    }
+    step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *step->drv);
 
-    step->preferLocalBuild = step->drvOptions->willBuildLocally(*localStore, *step->drv);
+    step->preferLocalBuild = step->parsedDrv->willBuildLocally(*localStore);
     step->isDeterministic = getOr(step->drv->env, "isDetermistic", "0") == "1";
 
     step->systemType = step->drv->platform;
     {
-        StringSet features = step->requiredSystemFeatures = step->drvOptions->getRequiredSystemFeatures(*step->drv);
+        StringSet features = step->requiredSystemFeatures = step->parsedDrv->getRequiredSystemFeatures();
         if (step->preferLocalBuild)
             features.insert("local");
         if (!features.empty()) {
@@ -522,15 +485,16 @@ Step::ptr State::createStep(ref<Store> destStore,
 
     /* Are all outputs valid? */
     auto outputHashes = staticOutputHashes(*localStore, *(step->drv));
-    std::map<DrvOutput, std::optional<StorePath>> paths;
+    bool valid = true;
+    std::map<DrvOutput, std::optional<StorePath>> missing;
     for (auto & [outputName, maybeOutputPath] : destStore->queryPartialDerivationOutputMap(drvPath, &*localStore)) {
         auto outputHash = outputHashes.at(outputName);
-        paths.insert({{outputHash, outputName}, maybeOutputPath});
+        if (maybeOutputPath && destStore->isValidPath(*maybeOutputPath))
+            continue;
+        valid = false;
+        missing.insert({{outputHash, outputName}, maybeOutputPath});
     }
 
-    auto missing = getMissingRemotePaths(destStore, paths);
-    bool valid = missing.empty();
-
     /* Try to copy the missing paths from the local store or from
        substitutes. */
     if (!missing.empty()) {

src/hydra-queue-runner/state.hh

@@ -6,8 +6,6 @@
 #include <map>
 #include <memory>
 #include <queue>
-#include <regex>
-#include <semaphore>
 
 #include <prometheus/counter.h>
 #include <prometheus/gauge.h>
@@ -15,18 +13,17 @@
 
 #include "db.hh"
 
-#include <nix/store/derivations.hh>
-#include <nix/store/derivation-options.hh>
-#include <nix/store/pathlocks.hh>
-#include <nix/util/pool.hh>
-#include <nix/store/build-result.hh>
-#include <nix/store/store-api.hh>
-#include <nix/util/sync.hh>
+#include "parsed-derivations.hh"
+#include "pathlocks.hh"
+#include "pool.hh"
+#include "build-result.hh"
+#include "store-api.hh"
+#include "sync.hh"
 #include "nar-extractor.hh"
-#include <nix/store/serve-protocol.hh>
-#include <nix/store/serve-protocol-impl.hh>
-#include <nix/store/serve-protocol-connection.hh>
-#include <nix/store/machines.hh>
+#include "serve-protocol.hh"
+#include "serve-protocol-impl.hh"
+#include "serve-protocol-connection.hh"
+#include "machines.hh"
 
 
 typedef unsigned int BuildID;
@@ -60,7 +57,6 @@ typedef enum {
     ssConnecting = 10,
     ssSendingInputs = 20,
     ssBuilding = 30,
-    ssWaitingForLocalSlot = 35,
     ssReceivingOutputs = 40,
     ssPostProcessing = 50,
 } StepState;
@@ -171,8 +167,8 @@ struct Step
 
     nix::StorePath drvPath;
     std::unique_ptr<nix::Derivation> drv;
-    std::unique_ptr<nix::DerivationOptions> drvOptions;
-    nix::StringSet requiredSystemFeatures;
+    std::unique_ptr<nix::ParsedDerivation> parsedDrv;
+    std::set<std::string> requiredSystemFeatures;
     bool preferLocalBuild;
     bool isDeterministic;
     std::string systemType; // concatenation of drv.platform and requiredSystemFeatures
@@ -356,10 +352,6 @@ private:
     typedef std::map<nix::StoreReference::Variant, Machine::ptr> Machines;
     nix::Sync<Machines> machines; // FIXME: use atomic_shared_ptr
 
-    /* Throttler for CPU-bound local work. */
-    static constexpr unsigned int maxSupportedLocalWorkers = 1024;
-    std::counting_semaphore<maxSupportedLocalWorkers> localWorkThrottler;
-
     /* Various stats. */
     time_t startedAt;
     counter nrBuildsRead{0};
@@ -369,7 +361,6 @@ private:
     counter nrStepsDone{0};
     counter nrStepsBuilding{0};
     counter nrStepsCopyingTo{0};
-    counter nrStepsWaitingForDownloadSlot{0};
     counter nrStepsCopyingFrom{0};
     counter nrStepsWaiting{0};
     counter nrUnsupportedSteps{0};
@@ -400,6 +391,7 @@ private:
 
     struct MachineReservation
     {
+        typedef std::shared_ptr<MachineReservation> ptr;
         State & state;
         Step::ptr step;
         Machine::ptr machine;
@@ -457,12 +449,7 @@ private:
         prometheus::Counter& queue_steps_created;
         prometheus::Counter& queue_checks_early_exits;
         prometheus::Counter& queue_checks_finished;
-
-        prometheus::Counter& dispatcher_time_spent_running;
-        prometheus::Counter& dispatcher_time_spent_waiting;
-
-        prometheus::Counter& queue_monitor_time_spent_running;
-        prometheus::Counter& queue_monitor_time_spent_waiting;
+        prometheus::Gauge& queue_max_id;
 
         PromMetrics();
     };
@@ -506,7 +493,8 @@ private:
     void queueMonitorLoop(Connection & conn);
 
     /* Check the queue for new builds. */
-    bool getQueuedBuilds(Connection & conn, nix::ref<nix::Store> destStore);
+    bool getQueuedBuilds(Connection & conn,
+        nix::ref<nix::Store> destStore, unsigned int & lastBuildId);
 
     /* Handle cancellation, deletion and priority bumps. */
     void processQueueChange(Connection & conn);
@@ -514,12 +502,6 @@ private:
     BuildOutput getBuildOutputCached(Connection & conn, nix::ref<nix::Store> destStore,
         const nix::StorePath & drvPath);
 
-    /* Returns paths missing from the remote store. Paths are processed in
-     * parallel to work around the possible latency of remote stores. */
-    std::map<nix::DrvOutput, std::optional<nix::StorePath>> getMissingRemotePaths(
-        nix::ref<nix::Store> destStore,
-        const std::map<nix::DrvOutput, std::optional<nix::StorePath>> & paths);
-
     Step::ptr createStep(nix::ref<nix::Store> store,
         Connection & conn, Build::ptr build, const nix::StorePath & drvPath,
         Build::ptr referringBuild, Step::ptr referringStep, std::set<nix::StorePath> & finishedDrvs,
@@ -549,17 +531,16 @@ private:
 
     void abortUnsupported();
 
-    void builder(std::unique_ptr<MachineReservation> reservation);
+    void builder(MachineReservation::ptr reservation);
 
     /* Perform the given build step. Return true if the step is to be
        retried. */
     enum StepResult { sDone, sRetry, sMaybeCancelled };
     StepResult doBuildStep(nix::ref<nix::Store> destStore,
-        std::unique_ptr<MachineReservation> reservation,
+        MachineReservation::ptr reservation,
         std::shared_ptr<ActiveStep> activeStep);
 
     void buildRemote(nix::ref<nix::Store> destStore,
-        std::unique_ptr<MachineReservation> reservation,
         Machine::ptr machine, Step::ptr step,
         const nix::ServeProto::BuildOptions & buildOptions,
         RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,

src/lib/Hydra/Controller/Build.pm

@@ -238,7 +238,7 @@ sub serveFile {
         # XSS hole.
         $c->response->header('Content-Security-Policy' => 'sandbox allow-scripts');
 
-        $c->stash->{'plain'} = { data => readIntoSocket(cmd => ["nix", "--experimental-features", "nix-command",
+        $c->stash->{'plain'} = { data => grab(cmd => ["nix", "--experimental-features", "nix-command",
                                                       "store", "cat", "--store", getStoreUri(), "$path"]) };
 
         # Detect MIME type.

src/lib/Hydra/Controller/Jobset.pm

@@ -364,21 +364,6 @@ sub evals_GET {
     );
 }
 
-sub errors :Chained('jobsetChain') :PathPart('errors') :Args(0) :ActionClass('REST') { }
-
-sub errors_GET {
-    my ($self, $c) = @_;
-
-    $c->stash->{template} = 'eval-error.tt';
-
-    my $jobsetName = $c->stash->{params}->{name};
-    $c->stash->{jobset} = $c->stash->{project}->jobsets->find(
-        { name => $jobsetName },
-        { '+columns' => { 'errormsg' => 'errormsg' } }
-    );
-
-    $self->status_ok($c, entity => $c->stash->{jobset});
-}
 
 # Redirect to the latest finished evaluation of this jobset.
 sub latest_eval : Chained('jobsetChain') PathPart('latest-eval') {

src/lib/Hydra/Controller/JobsetEval.pm

@@ -76,9 +76,7 @@ sub view_GET {
     $c->stash->{removed} = $diff->{removed};
     $c->stash->{unfinished} = $diff->{unfinished};
     $c->stash->{aborted} = $diff->{aborted};
-    $c->stash->{totalAborted} = $diff->{totalAborted};
-    $c->stash->{totalFailed} = $diff->{totalFailed};
-    $c->stash->{totalQueued} = $diff->{totalQueued};
+    $c->stash->{failed} = $diff->{failed};
 
     $c->stash->{full} = ($c->req->params->{full} || "0") eq "1";
 
@@ -88,17 +86,6 @@ sub view_GET {
     );
 }
 
-sub errors :Chained('evalChain') :PathPart('errors') :Args(0) :ActionClass('REST') { }
-
-sub errors_GET {
-    my ($self, $c) = @_;
-
-    $c->stash->{template} = 'eval-error.tt';
-
-    $c->stash->{eval} = $c->model('DB::JobsetEvals')->find($c->stash->{eval}->id, { prefetch => 'evaluationerror' });
-
-    $self->status_ok($c, entity => $c->stash->{eval});
-}
 
 sub create_jobset : Chained('evalChain') PathPart('create-jobset') Args(0) {
     my ($self, $c) = @_;

src/lib/Hydra/Controller/Root.pm

@@ -162,7 +162,7 @@ sub status_GET {
             { "buildsteps.busy" => { '!=', 0 } },
             { order_by => ["globalpriority DESC", "id"],
               join => "buildsteps",
-              columns => [@buildListColumns, 'buildsteps.drvpath', 'buildsteps.type']
+              columns => [@buildListColumns]
             })]
     );
 }

src/lib/Hydra/Helper/BuildDiff.pm

@@ -32,26 +32,12 @@ sub buildDiff {
         removed => [],
         unfinished => [],
         aborted => [],
-
-        # These summary counters cut across the categories to determine whether
-        # actions such as "Restart all failed" or "Bump queue" are available.
-        totalAborted => 0,
-        totalFailed => 0,
-        totalQueued => 0,
+        failed => [],
     };
 
     my $n = 0;
     foreach my $build (@{$builds}) {
-        my $aborted = $build->finished != 0 && (
-            # aborted
-            $build->buildstatus == 3
-            # cancelled
-            || $build->buildstatus == 4
-            # timeout
-            || $build->buildstatus == 7
-            # log limit exceeded
-            || $build->buildstatus == 10
-        );
+        my $aborted = $build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4);
         my $d;
         my $found = 0;
         while ($n < scalar(@{$builds2})) {
@@ -85,19 +71,12 @@ sub buildDiff {
         } else {
             push @{$ret->{new}}, $build if !$found;
         }
-
-        if ($build->finished != 0 && $build->buildstatus != 0) {
-            if ($aborted) {
-                ++$ret->{totalAborted};
-            } else {
-                ++$ret->{totalFailed};
-            }
-        } elsif ($build->finished == 0) {
-            ++$ret->{totalQueued};
+        if (defined $build->buildstatus && $build->buildstatus != 0) {
+            push @{$ret->{failed}}, $build;
         }
     }
 
     return $ret;
 }
 
-1;
+1;

src/lib/Hydra/Helper/Nix.pm

@@ -36,7 +36,6 @@ our @EXPORT = qw(
     jobsetOverview
     jobsetOverview_
     pathIsInsidePrefix
-    readIntoSocket
     readNixFile
     registerRoot
     restartBuilds
@@ -297,7 +296,8 @@ sub getEvals {
 
     my @evals = $evals_result_set->search(
         { hasnewbuilds => 1 },
-        { order_by => "$me.id DESC", rows => $rows, offset => $offset });
+        { order_by => "$me.id DESC", rows => $rows, offset => $offset
+        , prefetch => { evaluationerror => [ ] } });
     my @res = ();
     my $cache = {};
 
@@ -417,16 +417,6 @@ sub pathIsInsidePrefix {
     return $cur;
 }
 
-sub readIntoSocket{
-    my (%args) = @_;
-    my $sock;
-
-    eval {
-        open($sock, "-|", @{$args{cmd}}) or die q(failed to open socket from command:\n $x);
-    };
-
-    return $sock;
-}
 
 
 

src/lib/Hydra/Plugin/GiteaPulls.pm

@@ -1,84 +0,0 @@
-# Allow building based on Gitea pull requests.
-#
-# Example input:
-#   "pulls": {
-#     "type": "giteapulls",
-#     "value": "example.com alice repo"
-#     "emailresponsible": false
-#   }
-
-package Hydra::Plugin::GiteaPulls;
-
-use strict;
-use warnings;
-use parent 'Hydra::Plugin';
-use HTTP::Request;
-use LWP::UserAgent;
-use JSON::MaybeXS;
-use Hydra::Helper::CatalystUtils;
-use File::Temp;
-use POSIX qw(strftime);
-
-sub supportedInputTypes {
-    my ($self, $inputTypes) = @_;
-    $inputTypes->{'giteapulls'} = 'Open Gitea Pull Requests';
-}
-
-sub _iterate {
-    my ($url, $auth, $pulls, $ua) = @_;
-
-    my $req = HTTP::Request->new('GET', $url);
-    $req->header('Authorization' => 'token ' . $auth) if defined $auth;
-
-    my $res = $ua->request($req);
-    my $content = $res->decoded_content;
-    die "Error pulling from the gitea pulls API: $content\n"
-	unless $res->is_success;
-
-    my $pulls_list = decode_json $content;
-
-    foreach my $pull (@$pulls_list) {
-	$pulls->{$pull->{number}} = $pull;
-    }
-
-    # TODO Make Link header parsing more robust!!!
-    my @links = split ',', ($res->header("Link") // "");
-    my $next = "";
-    foreach my $link (@links) {
-        my ($url, $rel) = split ";", $link;
-        if (trim($rel) eq 'rel="next"') {
-            $next = substr trim($url), 1, -1;
-            last;
-        }
-    }
-    _iterate($next, $auth, $pulls, $ua) unless $next eq "";
-}
-
-sub fetchInput {
-    my ($self, $type, $name, $value, $project, $jobset) = @_;
-    return undef if $type ne "giteapulls";
-
-    my ($baseUrl, $owner, $repo, $proto) = split ' ', $value;
-    if (not defined $proto) { # the protocol handler is exposed as an option in order to do integration testing
-	$proto = "https"
-    }
-    my $auth = $self->{config}->{gitea_authorization}->{$owner};
-
-    my $ua = LWP::UserAgent->new();
-    my %pulls;
-    _iterate("$proto://$baseUrl/api/v1/repos/$owner/$repo/pulls?limit=100", $auth, \%pulls, $ua);
-
-    my $tempdir = File::Temp->newdir("gitea-pulls" . "XXXXX", TMPDIR => 1);
-    my $filename = "$tempdir/gitea-pulls.json";
-    open(my $fh, ">", $filename) or die "Cannot open $filename for writing: $!";
-    print $fh encode_json \%pulls;
-    close $fh;
-
-    my $storePath = trim(`nix-store --add "$filename"`
-        or die "cannot copy path $filename to the Nix store.\n");
-    chomp $storePath;
-    my $timestamp = time;
-    return { storePath => $storePath, revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp) };
-}
-
-1;

src/lib/Hydra/Plugin/GiteaRefs.pm

@@ -1,129 +0,0 @@
-package Hydra::Plugin::GiteaRefs;
-
-use strict;
-use warnings;
-use parent 'Hydra::Plugin';
-use HTTP::Request;
-use LWP::UserAgent;
-use JSON::MaybeXS;
-use Hydra::Helper::CatalystUtils;
-use File::Temp;
-use POSIX qw(strftime);
-
-=head1 NAME
-
-GiteaRefs - Hydra plugin for retrieving the list of references (branches or
-tags) from Gitea following a certain naming scheme
-
-=head1 DESCRIPTION
-
-This plugin reads the list of branches or tags using Gitea's REST API. The name
-of the reference must follow a particular prefix. This list is stored in the
-nix-store and used as an input to declarative jobsets.
-
-=head1 CONFIGURATION
-
-The plugin doesn't require any dedicated configuration block, but it has to
-consult C<gitea_authorization> entry for obtaining the API token. In addition,
-
-The declarative project C<spec.json> file must contains an input such as
-
-   "pulls": {
-     "type": "gitea_refs",
-     "value": "[gitea_hostname] [owner] [repo] heads|tags [scheme] - [prefix]",
-     "emailresponsible": false
-   }
-
-In the above snippet, C<[gitea_hostname]> must be set to the hostname of the
-repository's Gitea instance.
-
-C<[owner]> is the repository owner and C<[repo]> is the repository name. Also
-note a literal C<->, which is placed there for the future use.
-
-C<heads|tags> denotes that one of these two is allowed, that is, the third
-position should hold either the C<heads> or the C<tags> keyword. In case of the former, the plugin
-will fetch all branches, while in case of the latter, it will fetch the tags.
-
-C<scheme> should be set to either https or http, depending on what the Gitea
-host supports.
-
-C<prefix> denotes the prefix the reference name must start with, in order to be
-included.
-
-For example, C<"value": "projects.blender.org blender blender heads https - blender-v/"> refers to
-L<https://projects.blender.org/blender/blender> repository, and will fetch all branches that
-begin with C<blender-v/>.
-
-=head1 USE
-
-The result is stored in the nix-store as a JSON I<map>, where the key is the
-name of the reference, while the value is the complete Gitea response. Thus,
-any of the values listed in
-L<https://docs.gitea.com/api#tag/repository/operation/repoListAllGitRefs> can be
-used to build the git input value in C<jobsets.nix>.
-
-=cut
-
-sub supportedInputTypes {
-    my ($self, $inputTypes) = @_;
-    $inputTypes->{'gitea_refs'} = 'Open Gitea Refs';
-}
-
-sub _iterate {
-    my ($url, $auth, $refs, $ua) = @_;
-    my $req = HTTP::Request->new('GET', $url);
-    $req->header('Accept' => 'application/json');
-    $req->header('Authorization' => $auth) if defined $auth;
-    my $res = $ua->request($req);
-    my $content = $res->decoded_content;
-    die "Error pulling from the gitea refs API: $content\n"
-        unless $res->is_success;
-    my $refs_list = decode_json $content;
-    # TODO Stream out the json instead
-    foreach my $ref (@$refs_list) {
-        my $ref_name = $ref->{ref};
-        $ref_name =~ s,^refs/(?:heads|tags)/,,o;
-        $refs->{$ref_name} = $ref;
-    }
-    # TODO Make Link header parsing more robust!!!
-    my @links = split ',', $res->header("Link");
-    my $next = "";
-    foreach my $link (@links) {
-        my ($url, $rel) = split ";", $link;
-        if (trim($rel) eq 'rel="next"') {
-            $next = substr trim($url), 1, -1;
-            last;
-        }
-    }
-    _iterate($next, $auth, $refs, $ua) unless $next eq "";
-}
-
-sub fetchInput {
-    my ($self, $input_type, $name, $value, $project, $jobset) = @_;
-    return undef if $input_type ne "gitea_refs";
-
-    my ($giteaHostname, $owner, $repo, $type, $scheme, $fut, $prefix) = split ' ', $value;
-    die "type field is neither 'heads' nor 'tags', but '$type'"
-        unless $type eq 'heads' or $type eq 'tags';
-    die "scheme field is neither 'https' nor 'http' but '$scheme'"
-        unless $scheme eq 'https' or $scheme eq 'http';
-
-    my $auth = $self->{config}->{gitea_authorization}->{$owner};
-    my $giteaEndpoint = "$scheme://$giteaHostname";
-    my %refs;
-    my $ua = LWP::UserAgent->new();
-    _iterate("$giteaEndpoint/api/v1/repos/$owner/$repo/git/refs/$type/$prefix?per_page=100", $auth, \%refs, $ua);
-    my $tempdir = File::Temp->newdir("gitea-refs" . "XXXXX", TMPDIR => 1);
-    my $filename = "$tempdir/gitea-refs.json";
-    open(my $fh, ">", $filename) or die "Cannot open $filename for writing: $!";
-    print $fh encode_json \%refs;
-    close $fh;
-    system("jq -S . < $filename > $tempdir/gitea-refs-sorted.json");
-    my $storePath = trim(qx{nix-store --add "$tempdir/gitea-refs-sorted.json"}
-        or die "cannot copy path $filename to the Nix store.\n");
-    chomp $storePath;
-    my $timestamp = time;
-    return { storePath => $storePath, revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp) };
-}
-
-1;

src/lib/Hydra/Schema/Result/EvaluationErrors.pm

@@ -105,6 +105,4 @@ __PACKAGE__->add_column(
     "+id" => { retrieve_on_insert => 1 }
 );
 
-__PACKAGE__->mk_group_accessors('column' => 'has_error');
-
 1;

src/lib/Hydra/Schema/Result/Jobsets.pm

@@ -386,8 +386,6 @@ __PACKAGE__->add_column(
     "+id" => { retrieve_on_insert => 1 }
 );
 
-__PACKAGE__->mk_group_accessors('column' => 'has_error');
-
 sub supportsDynamicRunCommand {
   my ($self) = @_;
 

src/lib/Hydra/Schema/ResultSet/EvaluationErrors.pm

@@ -1,30 +0,0 @@
-package Hydra::Schema::ResultSet::EvaluationErrors;
-
-use strict;
-use utf8;
-use warnings;
-
-use parent 'DBIx::Class::ResultSet';
-
-use Storable qw(dclone);
-
-__PACKAGE__->load_components('Helper::ResultSet::RemoveColumns');
-
-# Exclude expensive error message values unless explicitly requested, and
-# replace them with a summary field describing their presence/absence.
-sub search_rs {
-  my ( $class, $query, $attrs ) = @_;
-
-  if ($attrs) {
-    $attrs = dclone($attrs);
-  }
-
-  unless (exists $attrs->{'select'} || exists $attrs->{'columns'}) {
-    $attrs->{'+columns'}->{'has_error'} = "errormsg != ''";
-  }
-  unless (exists $attrs->{'+columns'}->{'errormsg'}) {
-    push @{ $attrs->{'remove_columns'} }, 'errormsg';
-  }
-
-  return $class->next::method($query, $attrs);
-}

src/lib/Hydra/Schema/ResultSet/Jobsets.pm

@@ -1,30 +0,0 @@
-package Hydra::Schema::ResultSet::Jobsets;
-
-use strict;
-use utf8;
-use warnings;
-
-use parent 'DBIx::Class::ResultSet';
-
-use Storable qw(dclone);
-
-__PACKAGE__->load_components('Helper::ResultSet::RemoveColumns');
-
-# Exclude expensive error message values unless explicitly requested, and
-# replace them with a summary field describing their presence/absence.
-sub search_rs {
-  my ( $class, $query, $attrs ) = @_;
-
-  if ($attrs) {
-    $attrs = dclone($attrs);
-  }
-
-  unless (exists $attrs->{'select'} || exists $attrs->{'columns'}) {
-    $attrs->{'+columns'}->{'has_error'} = "errormsg != ''";
-  }
-  unless (exists $attrs->{'+columns'}->{'errormsg'}) {
-    push @{ $attrs->{'remove_columns'} }, 'errormsg';
-  }
-
-  return $class->next::method($query, $attrs);
-}

src/libhydra/db.hh

@@ -2,8 +2,8 @@
 
 #include <pqxx/pqxx>
 
-#include <nix/util/environment-variables.hh>
-#include <nix/util/util.hh>
+#include "environment-variables.hh"
+#include "util.hh"
 
 
 struct Connection : pqxx::connection

src/libhydra/hydra-config.hh

@@ -2,8 +2,8 @@
 
 #include <map>
 
-#include <nix/util/file-system.hh>
-#include <nix/util/util.hh>
+#include "file-system.hh"
+#include "util.hh"
 
 struct HydraConfig
 {

src/root/build.tt

@@ -61,7 +61,21 @@ END;
             <td>[% IF step.busy != 0 || ((step.machine || step.starttime) && (step.status == 0 || step.status == 1 || step.status == 3 || step.status == 4 || step.status == 7)); INCLUDE renderMachineName machine=step.machine; ELSE; "<em>n/a</em>"; END %]</td>
             <td class="step-status">
               [% IF step.busy != 0 %]
-                [% INCLUDE renderBusyStatus %]
+                [% IF step.busy == 1 %]
+                  <strong>Preparing</strong>
+                [% ELSIF step.busy == 10 %]
+                  <strong>Connecting</strong>
+                [% ELSIF step.busy == 20 %]
+                  <strong>Sending inputs</strong>
+                [% ELSIF step.busy == 30 %]
+                  <strong>Building</strong>
+                [% ELSIF step.busy == 40 %]
+                  <strong>Receiving outputs</strong>
+                [% ELSIF step.busy == 50 %]
+                  <strong>Post-processing</strong>
+                [% ELSE %]
+                  <strong>Unknown state</strong>
+                [% END %]
               [% ELSIF step.status == 0 %]
                 [% IF step.isnondeterministic %]
                   <span class="warn">Succeeded with non-determistic result</span>

src/root/common.tt

@@ -91,17 +91,6 @@ BLOCK renderDuration;
   duration % 60 %]s[%
 END;
 
-BLOCK renderDrvInfo;
-  drvname = step.drvpath
-    .substr(11) # strip `/nix/store/`
-    .split('-').slice(1).join("-") # strip hash part
-    .substr(0, -4); # strip `.drv`
-  IF drvname != releasename;
-    IF step.type == 0; action = "Build"; ELSE; action = "Substitution"; END;
-    IF drvname; %]<em> ([% action %] of [% drvname %])</em>[% END;
-  END;
-END;
-
 
 BLOCK renderBuildListHeader %]
   <table class="table table-striped table-condensed clickable-rows">
@@ -142,12 +131,7 @@ BLOCK renderBuildListBody;
       [% END %]
       <td><a class="row-link" href="[% link %]">[% build.id %]</a></td>
       [% IF !hideJobName %]
-        <td>
-          <a href="[%link%]">[% IF !hideJobsetName %][%build.jobset.get_column("project")%]:[%build.jobset.get_column("name")%]:[% END %][%build.get_column("job")%]</a>
-          [% IF showStepName %]
-            [% INCLUDE renderDrvInfo step=build.buildsteps releasename=build.nixname %]
-          [% END %]
-        </td>
+        <td><a href="[%link%]">[% IF !hideJobsetName %][%build.jobset.get_column("project")%]:[%build.jobset.get_column("name")%]:[% END %][%build.get_column("job")%]</td>
       [% END %]
       <td class="nowrap">[% t = showSchedulingInfo ? build.timestamp : build.stoptime; IF t; INCLUDE renderRelativeDate timestamp=(showSchedulingInfo ? build.timestamp : build.stoptime); ELSE; "-"; END %]</td>
       <td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
@@ -261,27 +245,6 @@ BLOCK renderBuildStatusIcon;
 END;
 
 
-BLOCK renderBusyStatus;
-  IF step.busy == 1 %]
-    <strong>Preparing</strong>
-  [% ELSIF step.busy == 10 %]
-    <strong>Connecting</strong>
-  [% ELSIF step.busy == 20 %]
-    <strong>Sending inputs</strong>
-  [% ELSIF step.busy == 30 %]
-    <strong>Building</strong>
-  [% ELSIF step.busy == 35 %]
-    <strong>Waiting to receive outputs</strong>
-  [% ELSIF step.busy == 40 %]
-    <strong>Receiving outputs</strong>
-  [% ELSIF step.busy == 50 %]
-    <strong>Post-processing</strong>
-  [% ELSE %]
-    <strong>Unknown state</strong>
-  [% END;
-END;
-
-
 BLOCK renderStatus;
   IF build.finished;
     buildstatus = build.buildstatus;
@@ -513,7 +476,7 @@ BLOCK renderEvals %]
             ELSE %]
              -
             [% END %]
-            [% IF eval.evaluationerror.has_error %]
+            [% IF eval.evaluationerror.errormsg %]
               <span class="badge badge-warning">Eval Errors</span>
             [% END %]
           </td>
@@ -639,7 +602,7 @@ BLOCK renderJobsetOverview %]
         <td>[% HTML.escape(j.description) %]</td>
         <td>[% IF j.lastcheckedtime;
                  INCLUDE renderDateTime timestamp = j.lastcheckedtime;
-                 IF j.has_error || j.fetcherrormsg; %]&nbsp;<span class = 'badge badge-warning'>Error</span>[% END;
+                 IF j.errormsg || j.fetcherrormsg; %]&nbsp;<span class = 'badge badge-warning'>Error</span>[% END;
                  ELSE; "-";
                END %]</td>
         [% IF j.get_column('nrtotal') > 0 %]

src/root/eval-error.tt

@@ -1,26 +0,0 @@
-[% PROCESS common.tt %]
-<!DOCTYPE html>
-
-<html lang="en">
-
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-    [% INCLUDE style.tt %]
-  </head>
-
-  <body>
-
-    <div class="tab-content tab-pane">
-        <div id="tabs-errors" class="">
-          [% IF eval %]
-              <p>Errors occurred at [% INCLUDE renderDateTime timestamp=(eval.evaluationerror.errortime || eval.timestamp) %].</p>
-              <div class="card bg-light"><div class="card-body"><pre>[% HTML.escape(eval.evaluationerror.errormsg) %]</pre></div></div>
-          [% ELSIF jobset %]
-              <p>Errors occurred at [% INCLUDE renderDateTime timestamp=(jobset.errortime || jobset.lastcheckedtime) %].</p>
-              <div class="card bg-light"><div class="card-body"><pre>[% HTML.escape(jobset.fetcherrormsg || jobset.errormsg) %]</pre></div></div>
-          [% END %]
-        </div>
-    </div>
-  </body>
-</html>

src/root/jobset-eval.tt

@@ -48,16 +48,16 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
       <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Actions</a>
       <div class="dropdown-menu">
         <a class="dropdown-item" href="[% c.uri_for(c.controller('JobsetEval').action_for('create_jobset'), [eval.id]) %]">Create a jobset from this evaluation</a>
-        [% IF totalQueued > 0 %]
+        [% IF unfinished.size > 0 %]
           <a class="dropdown-item" href="[% c.uri_for(c.controller('JobsetEval').action_for('cancel'), [eval.id]) %]">Cancel all scheduled builds</a>
         [% END %]
-        [% IF totalFailed > 0 %]
+        [% IF aborted.size > 0 || stillFail.size > 0 || nowFail.size > 0 || failed.size > 0 %]
           <a class="dropdown-item" href="[% c.uri_for(c.controller('JobsetEval').action_for('restart_failed'), [eval.id]) %]">Restart all failed builds</a>
         [% END %]
-        [% IF totalAborted > 0 %]
+        [% IF aborted.size > 0 %]
           <a class="dropdown-item" href="[% c.uri_for(c.controller('JobsetEval').action_for('restart_aborted'), [eval.id]) %]">Restart all aborted builds</a>
         [% END %]
-        [% IF totalQueued > 0 %]
+        [% IF unfinished.size > 0 %]
           <a class="dropdown-item" href="[% c.uri_for(c.controller('JobsetEval').action_for('bump'), [eval.id]) %]">Bump builds to front of queue</a>
         [% END %]
       </div>
@@ -65,7 +65,7 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
   [% END %]
 
   [% IF aborted.size > 0 %]
-    <li class="nav-item"><a class="nav-link" href="#tabs-aborted" data-toggle="tab"><span class="text-warning">Aborted / Timed out Jobs ([% aborted.size %])</span></a></li>
+    <li class="nav-item"><a class="nav-link" href="#tabs-aborted" data-toggle="tab"><span class="text-warning">Aborted Jobs ([% aborted.size %])</span></a></li>
   [% END %]
   [% IF nowFail.size > 0 %]
     <li class="nav-item"><a class="nav-link" href="#tabs-now-fail" data-toggle="tab"><span class="text-warning">Newly Failing Jobs ([% nowFail.size %])</span></a></li>
@@ -90,7 +90,7 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
   [% END %]
   <li class="nav-item"><a class="nav-link" href="#tabs-inputs" data-toggle="tab">Inputs</a></li>
 
-  [% IF eval.evaluationerror.has_error %]
+  [% IF eval.evaluationerror.errormsg %]
     <li class="nav-item"><a class="nav-link" href="#tabs-errors" data-toggle="tab"><span class="text-warning">Evaluation Errors</span></a></li>
   [% END %]
 </ul>
@@ -108,6 +108,13 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
 
 <div class="tab-content">
 
+  [% IF eval.evaluationerror.errormsg %]
+    <div id="tabs-errors" class="tab-pane">
+      <p>Errors occurred at [% INCLUDE renderDateTime timestamp=(eval.evaluationerror.errortime || eval.timestamp) %].</p>
+      <div class="card bg-light"><div class="card-body"><pre>[% HTML.escape(eval.evaluationerror.errormsg) %]</pre></div></div>
+    </div>
+  [% END %]
+
   <div id="tabs-aborted" class="tab-pane">
     [% INCLUDE renderSome builds=aborted tabname="#tabs-aborted" %]
   </div>
@@ -165,9 +172,10 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
     [% END %]
   </div>
 
-  [% IF eval.evaluationerror.has_error %]
+  [% IF eval.evaluationerror.errormsg %]
     <div id="tabs-errors" class="tab-pane">
-      <iframe src="[% c.uri_for(c.controller('JobsetEval').action_for('errors'), [eval.id], params) %]" loading="lazy" frameBorder="0" width="100%"></iframe>
+      <p>Errors occurred at [% INCLUDE renderDateTime timestamp=(eval.evaluationerror.errortime || eval.timestamp) %].</p>
+      <div class="card bg-light"><div class="card-body"><pre>[% HTML.escape(eval.evaluationerror.errormsg) %]</pre></div></div>
     </div>
   [% END %]
 </div>

src/root/jobset.tt

@@ -61,7 +61,7 @@
   [% END %]
 
   <li class="nav-item"><a class="nav-link active" href="#tabs-evaluations" data-toggle="tab">Evaluations</a></li>
-  [% IF jobset.has_error || jobset.fetcherrormsg %]
+  [% IF jobset.errormsg || jobset.fetcherrormsg %]
     <li class="nav-item"><a class="nav-link" href="#tabs-errors" data-toggle="tab"><span class="text-warning">Evaluation Errors</span></a></li>
   [% END %]
   <li class="nav-item"><a class="nav-link" href="#tabs-jobs" data-toggle="tab">Jobs</a></li>
@@ -79,7 +79,7 @@
         <th>Last checked:</th>
         <td>
           [% IF jobset.lastcheckedtime %]
-            [% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %], [% IF jobset.has_error || jobset.fetcherrormsg %]<em class="text-warning">with errors!</em>[% ELSE %]<em>no errors</em>[% END %]
+            [% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %], [% IF jobset.errormsg || jobset.fetcherrormsg %]<em class="text-warning">with errors!</em>[% ELSE %]<em>no errors</em>[% END %]
           [% ELSE %]
             <em>never</em>
           [% END %]
@@ -117,9 +117,10 @@
 
   </div>
 
-  [% IF jobset.has_error || jobset.fetcherrormsg %]
+  [% IF jobset.errormsg || jobset.fetcherrormsg %]
     <div id="tabs-errors" class="tab-pane">
-      <iframe src="[% c.uri_for('/jobset' project.name jobset.name "errors") %]" loading="lazy" frameBorder="0" width="100%"></iframe>
+      <p>Errors occurred at [% INCLUDE renderDateTime timestamp=(jobset.errortime || jobset.lastcheckedtime) %].</p>
+      <div class="card bg-light"><div class="card-body"><pre>[% HTML.escape(jobset.fetcherrormsg || jobset.errormsg) %]</pre></div></div>
     </div>
   [% END %]
 

src/root/layout.tt

@@ -10,7 +10,31 @@
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-    [% INCLUDE style.tt %]
+
+    <script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-3.4.1.min.js") %]"></script>
+    <script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-ui-1.10.4.min.js") %]"></script>
+    <script type="text/javascript" src="[% c.uri_for("/static/js/moment/moment-2.24.0.min.js") %]"></script>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <link href="[% c.uri_for("/static/fontawesome/css/all.css") %]" rel="stylesheet" />
+    <script type="text/javascript" src="[% c.uri_for("/static/js/popper.min.js") %]"></script>
+    <script type="text/javascript" src="[% c.uri_for("/static/bootstrap/js/bootstrap.min.js") %]"></script>
+    <link href="[% c.uri_for("/static/bootstrap/css/bootstrap.min.css") %]" rel="stylesheet" />
+
+    <!-- hydra.css may need to be moved to before boostrap to make the @media rule work. -->
+    <link rel="stylesheet" href="[% c.uri_for("/static/css/hydra.css") %]" type="text/css" />
+    <link rel="stylesheet" href="[% c.uri_for("/static/css/rotated-th.css") %]" type="text/css" />
+
+    <style>
+      .popover { max-width: 40%; }
+    </style>
+
+    <script type="text/javascript" src="[% c.uri_for("/static/js/bootbox.min.js") %]"></script>
+
+    <link rel="stylesheet" href="[% c.uri_for("/static/css/tree.css") %]" type="text/css" />
+
+    <script type="text/javascript" src="[% c.uri_for("/static/js/common.js") %]"></script>
 
     [% IF c.config.enable_google_login %]
       <meta name="google-signin-client_id" content="[% c.config.google_client_id %]">

src/root/machine-status.tt

@@ -6,10 +6,10 @@
   <thead>
     <tr>
       <th>Job</th>
+      <th>System</th>
       <th>Build</th>
       <th>Step</th>
       <th>What</th>
-      <th>Status</th>
       <th>Since</th>
     </tr>
   </thead>
@@ -17,7 +17,7 @@
     [% name = m.key ? stripSSHUser(m.key) : "localhost" %]
     <thead>
       <tr>
-        <th colspan="7">
+        <th colspan="6">
           <tt [% IF m.value.disabled %]style="text-decoration: line-through;"[% END %]>[% INCLUDE renderMachineName machine=m.key %]</tt>
           [% IF m.value.systemTypes %]
             <span class="muted" style="font-weight: normal;">
@@ -40,10 +40,10 @@
           [% idle = 0 %]
           <tr>
             <td><tt>[% INCLUDE renderFullJobName project=step.project jobset=step.jobset job=step.job %]</tt></td>
+            <td><tt>[% step.system %]</tt></td>
             <td><a href="[% c.uri_for('/build' step.build) %]">[% step.build %]</a></td>
             <td>[% IF step.busy >= 30 %]<a class="row-link" href="[% c.uri_for('/build' step.build 'nixlog' step.stepnr 'tail') %]">[% step.stepnr %]</a>[% ELSE; step.stepnr; END %]</td>
             <td><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
-            <td>[% INCLUDE renderBusyStatus %]</td>
             <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
           </tr>
         [% END %]

src/root/static/js/common.js

@@ -129,12 +129,6 @@ $(document).ready(function() {
             el.addClass("is-local");
         }
     });
-
-    [...document.getElementsByTagName("iframe")].forEach((element) => {
-        element.contentWindow.addEventListener("DOMContentLoaded", (_) => {
-            element.style.height = element.contentWindow.document.body.scrollHeight + 'px';
-        })
-    })
 });
 
 var tabsLoaded = {};

src/root/status.tt

@@ -7,7 +7,7 @@
 
 [% ELSE %]
 
-  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 showStepName=1 %]
+  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 %]
 
 [% END %]
 

src/root/style.tt

@@ -1,24 +0,0 @@
-<script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-3.4.1.min.js") %]"></script>
-<script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-ui-1.10.4.min.js") %]"></script>
-<script type="text/javascript" src="[% c.uri_for("/static/js/moment/moment-2.24.0.min.js") %]"></script>
-
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-<link href="[% c.uri_for("/static/fontawesome/css/all.css") %]" rel="stylesheet" />
-<script type="text/javascript" src="[% c.uri_for("/static/js/popper.min.js") %]"></script>
-<script type="text/javascript" src="[% c.uri_for("/static/bootstrap/js/bootstrap.min.js") %]"></script>
-<link href="[% c.uri_for("/static/bootstrap/css/bootstrap.min.css") %]" rel="stylesheet" />
-
-<!-- hydra.css may need to be moved to before boostrap to make the @media rule work. -->
-<link rel="stylesheet" href="[% c.uri_for("/static/css/hydra.css") %]" type="text/css" />
-<link rel="stylesheet" href="[% c.uri_for("/static/css/rotated-th.css") %]" type="text/css" />
-
-<style>
-  .popover { max-width: 40%; }
-</style>
-
-<script type="text/javascript" src="[% c.uri_for("/static/js/bootbox.min.js") %]"></script>
-
-<link rel="stylesheet" href="[% c.uri_for("/static/css/tree.css") %]" type="text/css" />
-
-<script type="text/javascript" src="[% c.uri_for("/static/js/common.js") %]"></script>

src/script/hydra-eval-jobset

@@ -372,7 +372,6 @@ sub evalJobs {
             or die "cannot find the input containing the job expression\n";
 
         @cmd = ("nix-eval-jobs",
-                "--option", "restrict-eval", "true",
                 "<" . $nixExprInputName . "/" . $nixExprPath . ">",
                 inputsToArgs($inputInfo));
     }
@@ -774,9 +773,6 @@ sub checkJobsetWrapped {
     my $jobsetChanged = 0;
     my %buildMap;
 
-    my @jobs;
-    push @jobs, $_ while defined($_ = $jobsIter->());
-
     $db->txn_do(sub {
         my $prevEval = getPrevJobsetEval($db, $jobset, 1);
 
@@ -800,7 +796,7 @@ sub checkJobsetWrapped {
 
         my @jobsWithConstituents;
 
-        foreach my $job (@jobs) {
+        while (defined(my $job = $jobsIter->())) {
             if ($jobsetsJobset) {
                 die "The .jobsets jobset must only have a single job named 'jobsets'"
                     unless $job->{attr} eq "jobsets";

t/Hydra/Controller/Jobset/evals.t

@@ -32,9 +32,4 @@ subtest "/jobset/PROJECT/JOBSET/evals" => sub {
     ok($jobsetevals->is_success, "The page showing the jobset evals returns 200.");
 };
 
-subtest "/jobset/PROJECT/JOBSET/errors" => sub {
-    my $jobsetevals = request(GET '/jobset/' . $project->name . '/' . $jobset->name . '/errors');
-    ok($jobsetevals->is_success, "The page showing the jobset eval errors returns 200.");
-};
-
 done_testing;

t/Hydra/Controller/JobsetEval/fetch.t

@@ -35,10 +35,6 @@ subtest "Fetching the eval's overview" => sub {
     is($fetch->code, 200, "channel page is 200");
 };
 
-subtest "Fetching the eval's overview" => sub {
-    my $fetch = request(GET '/eval/' . $eval->id, '/errors');
-    is($fetch->code, 200, "errors page is 200");
-};
 
 
 done_testing;

t/Hydra/Helper/BuildDiff.t

@@ -25,10 +25,7 @@ subtest "empty diff" => sub {
             removed => [],
             unfinished => [],
             aborted => [],
-
-            totalAborted => 0,
-            totalFailed => 0,
-            totalQueued => 0,
+            failed => [],
         },
         "empty list of jobs returns empty diff"
     );
@@ -51,7 +48,12 @@ subtest "2 different jobs" => sub {
         "succeed_with_failed is a new job"
     );
 
-    is($ret->{totalFailed}, 1, "total failed jobs is 1");
+    is(scalar(@{$ret->{failed}}), 1, "list of failed jobs is 1 element long");
+    is(
+        $ret->{failed}[0]->get_column('id'),
+        $builds->{"succeed_with_failed"}->get_column('id'),
+        "succeed_with_failed is a failed job"
+    );
 
     is(
         $ret->{removed},
@@ -68,9 +70,9 @@ subtest "2 different jobs" => sub {
 subtest "failed job with no previous history" => sub {
     my $ret = buildDiff([$builds->{"fails"}], []);
 
-    is($ret->{totalFailed}, 1, "total failed jobs is 1");
+    is(scalar(@{$ret->{failed}}), 1, "list of failed jobs is 1 element long");
     is(
-        $ret->{new}[0]->get_column('id'),
+        $ret->{failed}[0]->get_column('id'),
         $builds->{"fails"}->get_column('id'),
         "fails is a failed job"
     );
@@ -91,6 +93,7 @@ subtest "not-yet-built job with no previous history" => sub {
     is($ret->{removed}, [], "removed");
     is($ret->{unfinished}, [], "unfinished");
     is($ret->{aborted}, [], "aborted");
+    is($ret->{failed}, [], "failed");
 
     is(scalar(@{$ret->{new}}), 1, "list of new jobs is 1 element long");
     is(

t/evaluator/evaluate-constituents-globbing.t

@@ -61,8 +61,8 @@ subtest "* selects all except current aggregate" => sub {
 
         $jobset->discard_changes;  # refresh from DB
         is(
-            $jobset->has_error,
-            0,
+            $jobset->errormsg,
+            "",
             "eval-errors non-empty"
         );
     };
@@ -101,7 +101,7 @@ subtest "trivial cycle check" => sub {
 
     ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
 
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
+    $jobset->discard_changes;  # refresh from DB
     like(
         $jobset->errormsg,
         qr/Dependency cycle: indirect_aggregate <-> ok_aggregate/,
@@ -123,7 +123,7 @@ subtest "cycle check with globbing" => sub {
 
     ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
 
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
+    $jobset->discard_changes;  # refresh from DB
     like(
         $jobset->errormsg,
         qr/aggregate job ‘indirect_aggregate’ failed with the error: Dependency cycle: indirect_aggregate <-> packages.constituentA/,

t/lib/CliRunners.pm

@@ -14,7 +14,7 @@ our @EXPORT = qw(
 sub evalSucceeds {
     my ($jobset) = @_;
     my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("hydra-eval-jobset", $jobset->project->name, $jobset->name));
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
+    $jobset->discard_changes;  # refresh from DB
     if ($res) {
         chomp $stdout; chomp $stderr;
         utf8::decode($stdout) or die "Invalid unicode in stdout.";
@@ -29,7 +29,7 @@ sub evalSucceeds {
 sub evalFails {
     my ($jobset) = @_;
     my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("hydra-eval-jobset", $jobset->project->name, $jobset->name));
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
+    $jobset->discard_changes;  # refresh from DB
     if (!$res) {
         chomp $stdout; chomp $stderr;
         utf8::decode($stdout) or die "Invalid unicode in stdout.";

t/queue-runner/direct-indirect-constituents.t

@@ -13,7 +13,7 @@ my $constituentBuildA = $builds->{"constituentA"};
 my $constituentBuildB = $builds->{"constituentB"};
 
 my $eval = $constituentBuildA->jobsetevals->first();
-is($eval->evaluationerror->has_error, 0);
+is($eval->evaluationerror->errormsg, "");
 
 subtest "Verifying the direct aggregate" => sub {
     my $aggBuild = $builds->{"direct_aggregate"};