From 4bcbed2f1b4bb517a4ec02328d934f3c5c0cc5da Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:11:26 +1000
Subject: [PATCH 1/3] hydraTest: remove outdated postgresql version
error: postgresql_12 has been removed since it reached its EOL upstream
---
nixos-modules/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix
index 62b18406..d12d8338 100644
--- a/nixos-modules/default.nix
+++ b/nixos-modules/default.nix
@@ -15,7 +15,6 @@
systemd.services.hydra-send-stats.enable = false;
services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql_12;
# The following is to work around the following error from hydra-server:
# [error] Caught exception in engine "Cannot determine local time zone"
From feebb618978a39b07ca040417d1e6fcb63b402ec Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:07:25 +1000
Subject: [PATCH 2/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'nix-eval-jobs':
'github:nix-community/nix-eval-jobs/4b392b284877d203ae262e16af269f702df036bc?narHash=sha256-3wIReAqdTALv39gkWXLMZQvHyBOc3yPkWT2ZsItxedY%3D' (2025-02-14)
→ 'github:nix-community/nix-eval-jobs/f7418fc1fa45b96d37baa95ff3c016dd5be3876b?narHash=sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0%3D' (2025-03-26)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index c47a3b88..6f1b1347 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
"nix-eval-jobs": {
"flake": false,
"locked": {
- "lastModified": 1739500569,
- "narHash": "sha256-3wIReAqdTALv39gkWXLMZQvHyBOc3yPkWT2ZsItxedY=",
+ "lastModified": 1743008255,
+ "narHash": "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
- "rev": "4b392b284877d203ae262e16af269f702df036bc",
+ "rev": "f7418fc1fa45b96d37baa95ff3c016dd5be3876b",
"type": "github"
},
"original": {
From 9911f0107fc0a7a8142f3b9b194e83d3cbcd08bd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 16 Jan 2025 15:50:00 +0100
Subject: [PATCH 3/3] Reimplement (named) constituent jobs (+globbing) based on
nix-eval-jobs
Depends on https://github.com/nix-community/nix-eval-jobs/pull/349 & #1421.
Almost equivalent to #1425, but with a small change: when having e.g. an
aggregate job with a glob that matches nothing, the jobset evaluation is
failed now. This was the intended behavior before (hydra-eval-jobset
fails hard if an aggregate is broken), the code-path was never reached
however since the aggregate was never marked as broken in this case
before.
---
t/evaluator/evaluate-constituents-broken.t | 68 ++++++---
t/evaluator/evaluate-constituents-globbing.t | 138 +++++++++++++++++++
t/jobs/config.nix | 14 ++
t/jobs/constituents-cycle-glob.nix | 34 +++++
t/jobs/constituents-cycle.nix | 21 +++
t/jobs/constituents-glob-all.nix | 22 +++
t/jobs/constituents-glob.nix | 31 +++++
t/jobs/constituents-no-matches.nix | 20 +++
t/jobs/declarative/project.json | 24 ++++
t/queue-runner/constituents.t | 4 +-
10 files changed, 354 insertions(+), 22 deletions(-)
create mode 100644 t/evaluator/evaluate-constituents-globbing.t
create mode 100644 t/jobs/config.nix
create mode 100644 t/jobs/constituents-cycle-glob.nix
create mode 100644 t/jobs/constituents-cycle.nix
create mode 100644 t/jobs/constituents-glob-all.nix
create mode 100644 t/jobs/constituents-glob.nix
create mode 100644 t/jobs/constituents-no-matches.nix
create mode 100644 t/jobs/declarative/project.json
diff --git a/t/evaluator/evaluate-constituents-broken.t b/t/evaluator/evaluate-constituents-broken.t
index 0e5960bf..1391b618 100644
--- a/t/evaluator/evaluate-constituents-broken.t
+++ b/t/evaluator/evaluate-constituents-broken.t
@@ -6,27 +6,55 @@ use Hydra::Helper::Exec;
my $ctx = test_context();
-my $jobsetCtx = $ctx->makeJobset(
- expression => 'constituents-broken.nix',
-);
-my $jobset = $jobsetCtx->{"jobset"};
+subtest "broken constituents expression" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-broken.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
-my ($res, $stdout, $stderr) = captureStdoutStderr(60,
- ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-);
-isnt($res, 0, "hydra-eval-jobset exits non-zero");
-ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-like(
- $stderr,
- qr/aggregate job ‘mixed_aggregate’ failed with the error: "constituentA": does not exist/,
- "The stderr record includes a relevant error message"
-);
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+ isnt($res, 0, "hydra-eval-jobset exits non-zero");
+ ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+ like(
+ $stderr,
+ qr/aggregate job 'mixed_aggregate' references non-existent job 'constituentA'/,
+ "The stderr record includes a relevant error message"
+ );
-$jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} }); # refresh from DB
-like(
- $jobset->errormsg,
- qr/aggregate job ‘mixed_aggregate’ failed with the error: "constituentA": does not exist/,
- "The jobset records a relevant error message"
-);
+ $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} }); # refresh from DB
+ like(
+ $jobset->errormsg,
+ qr/aggregate job ‘mixed_aggregate’ failed with the error: constituentA: does not exist/,
+ "The jobset records a relevant error message"
+ );
+};
+
+subtest "no matches" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-no-matches.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
+
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+ isnt($res, 0, "hydra-eval-jobset exits non-zero");
+ ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+ like(
+ $stderr,
+ qr/aggregate job 'non_match_aggregate' references constituent glob pattern 'tests\.\*' with no matches/,
+ "The stderr record includes a relevant error message"
+ );
+
+ $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} }); # refresh from DB
+ like(
+ $jobset->errormsg,
+ qr/aggregate job ‘non_match_aggregate’ failed with the error: tests\.\*: constituent glob pattern had no matches/,
+ qr/in job ‘non_match_aggregate’:\ntests\.\*: constituent glob pattern had no matches/,
+ "The jobset records a relevant error message"
+ );
+};
done_testing;
diff --git a/t/evaluator/evaluate-constituents-globbing.t b/t/evaluator/evaluate-constituents-globbing.t
new file mode 100644
index 00000000..49315d58
--- /dev/null
+++ b/t/evaluator/evaluate-constituents-globbing.t
@@ -0,0 +1,138 @@
+use strict;
+use warnings;
+use Setup;
+use Test2::V0;
+use Hydra::Helper::Exec;
+use Data::Dumper;
+
+my $ctx = test_context();
+
+subtest "general glob testing" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-glob.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
+
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+ is($res, 0, "hydra-eval-jobset exits zero");
+
+ my $builds = {};
+ for my $build ($jobset->builds) {
+ $builds->{$build->job} = $build;
+ }
+
+ subtest "basic globbing works" => sub {
+ ok(defined $builds->{"ok_aggregate"}, "'ok_aggregate' is part of the jobset evaluation");
+ my @constituents = $builds->{"ok_aggregate"}->constituents->all;
+ is(2, scalar @constituents, "'ok_aggregate' has two constituents");
+
+ my @sortedConstituentNames = sort (map { $_->nixname } @constituents);
+
+ is($sortedConstituentNames[0], "empty-dir-A", "first constituent of 'ok_aggregate' is 'empty-dir-A'");
+ is($sortedConstituentNames[1], "empty-dir-B", "second constituent of 'ok_aggregate' is 'empty-dir-B'");
+ };
+
+ subtest "transitivity is OK" => sub {
+ ok(defined $builds->{"indirect_aggregate"}, "'indirect_aggregate' is part of the jobset evaluation");
+ my @constituents = $builds->{"indirect_aggregate"}->constituents->all;
+ is(1, scalar @constituents, "'indirect_aggregate' has one constituent");
+ is($constituents[0]->nixname, "direct_aggregate", "'indirect_aggregate' has 'direct_aggregate' as single constituent");
+ };
+};
+
+subtest "* selects all except current aggregate" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-glob-all.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
+
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+
+ subtest "no eval errors" => sub {
+ ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+ ok(
+ $stderr !~ "aggregate job ‘ok_aggregate’ has a constituent .* that doesn't correspond to a Hydra build",
+ "Catchall wildcard must not select itself as constituent"
+ );
+
+ $jobset->discard_changes; # refresh from DB
+ is(
+ $jobset->errormsg,
+ "",
+ "eval-errors non-empty"
+ );
+ };
+
+ my $builds = {};
+ for my $build ($jobset->builds) {
+ $builds->{$build->job} = $build;
+ }
+
+ subtest "two constituents" => sub {
+ ok(defined $builds->{"ok_aggregate"}, "'ok_aggregate' is part of the jobset evaluation");
+ my @constituents = $builds->{"ok_aggregate"}->constituents->all;
+ is(2, scalar @constituents, "'ok_aggregate' has two constituents");
+
+ my @sortedConstituentNames = sort (map { $_->nixname } @constituents);
+
+ is($sortedConstituentNames[0], "empty-dir-A", "first constituent of 'ok_aggregate' is 'empty-dir-A'");
+ is($sortedConstituentNames[1], "empty-dir-B", "second constituent of 'ok_aggregate' is 'empty-dir-B'");
+ };
+};
+
+subtest "trivial cycle check" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-cycle.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
+
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+
+ ok(
+ $stderr =~ "Found dependency cycle between jobs 'indirect_aggregate' and 'ok_aggregate'",
+ "Dependency cycle error is on stderr"
+ );
+
+ ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+
+ $jobset->discard_changes; # refresh from DB
+ like(
+ $jobset->errormsg,
+ qr/Dependency cycle: indirect_aggregate <-> ok_aggregate/,
+ "eval-errors non-empty"
+ );
+
+ is(0, $jobset->builds->count, "No builds should be scheduled");
+};
+
+subtest "cycle check with globbing" => sub {
+ my $jobsetCtx = $ctx->makeJobset(
+ expression => 'constituents-cycle-glob.nix',
+ );
+ my $jobset = $jobsetCtx->{"jobset"};
+
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+ ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+ );
+
+ ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+
+ $jobset->discard_changes; # refresh from DB
+ like(
+ $jobset->errormsg,
+ qr/aggregate job ‘indirect_aggregate’ failed with the error: Dependency cycle: indirect_aggregate <-> packages.constituentA/,
+ "packages.constituentA error missing"
+ );
+
+ # on this branch of Hydra, hydra-eval-jobset fails hard if an aggregate
+ # job is broken.
+ is(0, $jobset->builds->count, "Zero jobs are scheduled");
+};
+
+done_testing;
diff --git a/t/jobs/config.nix b/t/jobs/config.nix
new file mode 100644
index 00000000..91fd1d1a
--- /dev/null
+++ b/t/jobs/config.nix
@@ -0,0 +1,14 @@
+rec {
+ path = "/nix/store/l9mg93sgx50y88p5rr6x1vib6j1rjsds-coreutils-9.1/bin";
+
+ mkDerivation = args:
+ derivation ({
+ system = builtins.currentSystem;
+ PATH = path;
+ } // args);
+ mkContentAddressedDerivation = args: mkDerivation ({
+ __contentAddressed = true;
+ outputHashMode = "recursive";
+ outputHashAlgo = "sha256";
+ } // args);
+}
diff --git a/t/jobs/constituents-cycle-glob.nix b/t/jobs/constituents-cycle-glob.nix
new file mode 100644
index 00000000..efc152ce
--- /dev/null
+++ b/t/jobs/constituents-cycle-glob.nix
@@ -0,0 +1,34 @@
+with import ./config.nix;
+{
+ packages.constituentA = mkDerivation {
+ name = "empty-dir-A";
+ builder = ./empty-dir-builder.sh;
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [ "*_aggregate" ];
+ };
+
+ packages.constituentB = mkDerivation {
+ name = "empty-dir-B";
+ builder = ./empty-dir-builder.sh;
+ };
+
+ ok_aggregate = mkDerivation {
+ name = "direct_aggregate";
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [
+ "packages.*"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+
+ indirect_aggregate = mkDerivation {
+ name = "indirect_aggregate";
+ _hydraAggregate = true;
+ constituents = [
+ "ok_aggregate"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+}
diff --git a/t/jobs/constituents-cycle.nix b/t/jobs/constituents-cycle.nix
new file mode 100644
index 00000000..7e086aa1
--- /dev/null
+++ b/t/jobs/constituents-cycle.nix
@@ -0,0 +1,21 @@
+with import ./config.nix;
+{
+ ok_aggregate = mkDerivation {
+ name = "direct_aggregate";
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [
+ "indirect_aggregate"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+
+ indirect_aggregate = mkDerivation {
+ name = "indirect_aggregate";
+ _hydraAggregate = true;
+ constituents = [
+ "ok_aggregate"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+}
diff --git a/t/jobs/constituents-glob-all.nix b/t/jobs/constituents-glob-all.nix
new file mode 100644
index 00000000..d671fd70
--- /dev/null
+++ b/t/jobs/constituents-glob-all.nix
@@ -0,0 +1,22 @@
+with import ./config.nix;
+{
+ packages.constituentA = mkDerivation {
+ name = "empty-dir-A";
+ builder = ./empty-dir-builder.sh;
+ };
+
+ packages.constituentB = mkDerivation {
+ name = "empty-dir-B";
+ builder = ./empty-dir-builder.sh;
+ };
+
+ ok_aggregate = mkDerivation {
+ name = "direct_aggregate";
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [
+ "*"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+}
diff --git a/t/jobs/constituents-glob.nix b/t/jobs/constituents-glob.nix
new file mode 100644
index 00000000..f566dbfd
--- /dev/null
+++ b/t/jobs/constituents-glob.nix
@@ -0,0 +1,31 @@
+with import ./config.nix;
+{
+ packages.constituentA = mkDerivation {
+ name = "empty-dir-A";
+ builder = ./empty-dir-builder.sh;
+ };
+
+ packages.constituentB = mkDerivation {
+ name = "empty-dir-B";
+ builder = ./empty-dir-builder.sh;
+ };
+
+ ok_aggregate = mkDerivation {
+ name = "direct_aggregate";
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [
+ "packages.*"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+
+ indirect_aggregate = mkDerivation {
+ name = "indirect_aggregate";
+ _hydraAggregate = true;
+ constituents = [
+ "ok_aggregate"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+}
diff --git a/t/jobs/constituents-no-matches.nix b/t/jobs/constituents-no-matches.nix
new file mode 100644
index 00000000..699cad91
--- /dev/null
+++ b/t/jobs/constituents-no-matches.nix
@@ -0,0 +1,20 @@
+with import ./config.nix;
+{
+ non_match_aggregate = mkDerivation {
+ name = "mixed_aggregate";
+ _hydraAggregate = true;
+ _hydraGlobConstituents = true;
+ constituents = [
+ "tests.*"
+ ];
+ builder = ./empty-dir-builder.sh;
+ };
+
+ # Without a second job no jobset is attempted to be created
+ # (the only job would be broken)
+ # and thus the constituent validation is never reached.
+ dummy = mkDerivation {
+ name = "dummy";
+ builder = ./empty-dir-builder.sh;
+ };
+}
diff --git a/t/jobs/declarative/project.json b/t/jobs/declarative/project.json
new file mode 100644
index 00000000..47d6ecf2
--- /dev/null
+++ b/t/jobs/declarative/project.json
@@ -0,0 +1,24 @@
+{
+ "enabled": 1,
+ "hidden": false,
+ "description": "declarative-jobset-example",
+ "nixexprinput": "src",
+ "nixexprpath": "declarative/generator.nix",
+ "checkinterval": 300,
+ "schedulingshares": 100,
+ "enableemail": false,
+ "emailoverride": "",
+ "keepnr": 3,
+ "inputs": {
+ "src": {
+ "type": "path",
+ "value": "/home/ma27/Projects/hydra-cppnix/t/jobs",
+ "emailresponsible": false
+ },
+ "jobspath": {
+ "type": "string",
+ "value": "/home/ma27/Projects/hydra-cppnix/t/jobs",
+ "emailresponsible": false
+ }
+ }
+}
diff --git a/t/queue-runner/constituents.t b/t/queue-runner/constituents.t
index e1b8d733..8e048a73 100644
--- a/t/queue-runner/constituents.t
+++ b/t/queue-runner/constituents.t
@@ -22,11 +22,11 @@ is(nrQueuedBuildsForJobset($jobset), 0, "Evaluating jobs/broken-constituent.nix
like(
$jobset->errormsg,
- qr/^"does-not-exist": does not exist$/m,
+ qr/^does-not-exist: does not exist$/m,
"Evaluating jobs/broken-constituent.nix should log an error for does-not-exist");
like(
$jobset->errormsg,
- qr/^"does-not-evaluate": "error: assertion 'false' failed/m,
+ qr/^does-not-evaluate: error: assertion 'false' failed/m,
"Evaluating jobs/broken-constituent.nix should log an error for does-not-evaluate");
done_testing;