Skip to content

testers: docs and move#171647

Merged
roberth merged 8 commits intoNixOS:masterfrom
hercules-ci:testers
May 9, 2022
Merged

testers: docs and move#171647
roberth merged 8 commits intoNixOS:masterfrom
hercules-ci:testers

Conversation

@roberth
Copy link
Member

@roberth roberth commented May 5, 2022 •
edited
Loading

Description of changes

Closes #156785

Tidy up the testers a bit.

  • move invalidateFetcherByDrvHash into place as expected from docs
  • move nixosTest to testers too and document it in the manual

image

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation labels May 5, 2022
@roberth roberth added 6.topic: testing Tooling for automated testing of packages and modules and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) labels May 5, 2022
@github-actions github-actions bot added 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation labels May 5, 2022
@ofborg ofborg bot added 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. labels May 5, 2022
@roberth roberth requested review from Artturin, ncfavier and yu-re-ka and removed request for Artturin and yu-re-ka May 5, 2022 11:13
@roberth roberth changed the title Testers testers: docs and move May 5, 2022
ncfavier
ncfavier reviewed May 6, 2022
View reviewed changes
Copy link
Member

@ncfavier ncfavier left a comment

Choose a reason for hiding this comment

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

LGTM, though there are still a couple uses of the top-level nixosTest alias left.

doc/builders/testers.chapter.md

Notable attributes:

* `nodes`: the evaluated NixOS configurations. Useful for debugging and exploring the configuration.
Copy link
Member

@ncfavier ncfavier May 6, 2022

Choose a reason for hiding this comment

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

Note that in #164660 I changed nodes from being a function that takes a qemu package to that function applied to pkgs.qemu_test. I didn't give it much thought back then, and I don't know what we actually want to expose here.

Copy link
Member Author

@roberth roberth May 6, 2022

Choose a reason for hiding this comment

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

I guess that change didn't invalidate the spirit of this doc. Did you have a specific reason to change it, or was it for implementation simplicity?

I think we could change it back when making the tests more flexible as I've proposed in #171396. The qemu package will be configurable, so if you want to apply it to another qemu, you can do so by defining the option value instead. I'm leaning towards leaving this as is for the time being.

Copy link
Member

@ncfavier ncfavier May 6, 2022

Choose a reason for hiding this comment

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

Did you have a specific reason to change it, or was it for implementation simplicity?

It was just for simplicity.

roberth added 2 commits May 9, 2022 14:16
@github-actions github-actions bot added the 8.has: changelog This PR adds or changes release notes label May 9, 2022
@roberth roberth mentioned this pull request May 9, 2022
Merged
9 tasks
@roberth
testers.nixosTest: Remove redundant system.stateVersion = lib.trivial…
c3bbe1d 
….release;

Already present in nixos/modules/testing/test-instrumentation.nix,
which is imported by the test framework.
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels May 9, 2022
@roberth roberth merged commit 403d21a into NixOS:master May 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ncfavier ncfavier ncfavier left review comments

@Artturin Artturin Artturin approved these changes

Assignees

No one assigned

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 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 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Level up the test functions

3 participants

@roberth @ncfavier @Artturin