merge/upstream #2

ahuston-0 · 2025-03-31T04:06:13-04:00

ahuston-0 commented

2025-03-31 04:06:13 -04:00

No description provided.

ahuston-0 added 22 commits 2025-03-31 04:06:14 -04:00

Merge pull request #1444 from NixOS/use-legacy-ssh-store 18c0d76210

Use `LegacySSHStore`

Fix rendering of metrics with special characters d22d030503

My main motivation here is to get metrics with brackets to work in order
to support "pytest" test names:

- test_foo.py::test_bar[1]
- test_foo.py::test_bar[2]

I couldn't find an "HTML escape"-style function that would generate
valid html `id` attribute names from random strings, so I went with a
hash digest instead.

Fix race condition in hydra-compress-logs f1deb22c02

Revert "Use LegacySSHStore" 9a5bd39d4c

There were some hangs caused by this. Need to fix them, ideally
reproducing the issue in a test, before trying this again.

This reverts commit 4a4a0f901c.

Merge pull request #1451 from NixOS/revert-to-fix-hangs 97dcdae068

Revert "Use `LegacySSHStore`"

Merge pull request #1450 from NixOS/hydra-compress-race d2db3c7446

Fix race condition in hydra-compress-logs

hydra-eval-jobset: do not wait on n-e-j inside transaction 987dad3371

fixes #1429

hydraTest: remove outdated postgresql version 4bcbed2f1b

error: postgresql_12 has been removed since it reached its EOL upstream

flake.lock: Update feebb61897

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)

Reimplement (named) constituent jobs (+globbing) based on nix-eval-jobs 9911f0107f

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.

Merge pull request #1455 from qowoz/226-constituent b2fe3f5218

nix-eval-jobs + constituent globs

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

Fix rendering of metrics with special characters

Merge pull request #1457 from dermetfan/fix-1429 b657bcdfb7

hydra-eval-jobset: do not wait on n-e-j inside transaction

fix development workflow after switching to meson-based build ae18a7b3ae

gitignore hydra-data as created by foreman 3fef32b364

Merge pull request #1458 from NixOS/meson cad08f87d2

docs: fix contribution guide for new meson-based build

Add a plugin to poll Gitea pull requests 0f3fcf5e80

Based off the existing GithubPulls.pm and GitlabPulls.pm plugins.

Also adds an integration test for the new 'giteapulls' input type to
the existing 'gitea' test.

add Gitea pulls docs entry ff5a37edc4

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

add gitea refs a1a2d37290

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

fix api endpoint 230f71e7bb

add gitea ref tests 082fb6d40c

add gitea refs to docs fed0c517bf

This pull request has changes conflicting with the target branch.

README.md
doc/manual/src/hacking.md
flake.lock
nixos-modules/hydra.nix
package.nix
src/hydra-queue-runner/build-remote.cc
src/hydra-queue-runner/state.hh
src/lib/Hydra/Plugin/GiteaPulls.pm
src/lib/Hydra/Plugin/GiteaRefs.pm
t/evaluator/evaluate-constituents-globbing.t

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin merge/upstream:merge/upstream

git checkout merge/upstream

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: ahuston-0/hydra#2