Skip to content

nixos/tests: respect meta.hydraPlatforms#503721

Merged
roberth merged 3 commits into
NixOS:masterfrom
Ma27:dont-build-nspawn-tests-on-hydra
Mar 27, 2026
Merged

nixos/tests: respect meta.hydraPlatforms#503721
roberth merged 3 commits into
NixOS:masterfrom
Ma27:dont-build-nspawn-tests-on-hydra

Conversation

@Ma27

@Ma27 Ma27 commented Mar 26, 2026

Copy link
Copy Markdown
Member

Motivation is to not build nspawn tests on hydra.nixos.org for the time being.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules labels Mar 26, 2026
@Ma27 Ma27 force-pushed the dont-build-nspawn-tests-on-hydra branch from f21ada2 to 56521c1 Compare March 26, 2026 12:06

@jfly jfly left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of comments I trust you to resolve without another review from me.

Comment thread nixos/release.nix
Comment thread nixos/tests/nixos-test-driver/containers.nix
@Ma27 Ma27 force-pushed the dont-build-nspawn-tests-on-hydra branch from 56521c1 to d4b38bb Compare March 26, 2026 13:11
@Ma27 Ma27 force-pushed the dont-build-nspawn-tests-on-hydra branch from d4b38bb to ec2c751 Compare March 26, 2026 13:12
@Ma27

Ma27 commented Mar 26, 2026

Copy link
Copy Markdown
Member Author

Done!
Pushed a fix to do the same for allDrivers.

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 26, 2026
Comment thread nixos/release.nix
in
lib.optionalAttrs (builtins.elem system (getPlatforms driver)) (
if attrNamesOnly then
hydraJob driver

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a material change. Previously we were passing config.test. Was this intentional?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the attribute is supposed to contain all drivers here.
I split this into its own commit such that it's clear when looking at the history or bisecting.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate the separate commit, but I'm still confused about if this is a correct change. I just don't have the context, sorry.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reasoning is fairly simple: this generates the jobs inside a allDrivers attribute and the if/else only decides whether an attribute for system is added. To me it seems very wrong that this also switches the job from a test-driver to a test.

cc @wolfgangwalther who originally added this.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like that was a copy&paste mistake in my commit e3f583c.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

callTest needs to be burned down, and be replaced by a simpler solution. (which will in turn be easier to do after #386873)

I've worked on stuff involving callTest before and I consistently fail to reason about the multiple ways in which it is called, in which it is defined, and how those all interact.

I would review this, but it'd be a worthless review, or it'd be a research project.
I suggest throwing the spaghetti at the wall with a lot of force for the time being.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm interpreting this as a decline to review (which is OK - don't get me wrong!) and not as blocking this patch: while I understand the argument of prefering a totally different solution, this approach solves a real problem of a test-driver option being flat-out ignored when we actually need this option now after the introduction of the nspawn backend.

@roberth roberth Mar 27, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My ranting was meant to be informative. I fully support proceeding with this.

@jfly jfly left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, modulo my lack of understanding about the "always add config.driver to allDrivers" commit.

@wolfgangwalther wolfgangwalther left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only looked at the first commit.

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Mar 27, 2026
@roberth roberth added this pull request to the merge queue Mar 27, 2026
Merged via the queue into NixOS:master with commit d7df9ad Mar 27, 2026
40 of 42 checks passed
@Ma27 Ma27 deleted the dont-build-nspawn-tests-on-hydra branch April 7, 2026 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants