Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixosTest: Fix infinite recursion involving hasContext testScript whe… #144014

Merged
merged 1 commit into from
Oct 31, 2021

Conversation

roberth
Copy link
Member

@roberth roberth commented Oct 31, 2021

…n useNixStoreImage = true

The involved test was nixosTests.nextcloud.basic21.

It has a testScript that is strict in nodes.nextcloud.config.system.build.vm,
in assertions about imagemagick being in the system closure.

The recursion was introduced in 329a446 from
#140792

Motivation for this change

Unbreak nixos-unstable channel.

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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
  • Fits CONTRIBUTING.md.

…n useNixStoreImage = true

The involved test was nixosTests.nextcloud.basic21.

It has a testScript that is strict in nodes.nextcloud.config.system.build.vm,
in assertions about imagemagick being in the system closure.

The recursion was introduced in 329a446 from
NixOS#140792
@roberth roberth requested a review from talyz October 31, 2021 17:26
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 31, 2021
@roberth
Copy link
Member Author

roberth commented Oct 31, 2021

@GrahamcOfBorg build nixosTests.nextcloud nixosTests.gitlab

nextcloud: offending evaluation
gitlab: example of a test that uses useNixStoreImage

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 31, 2021
@roberth
Copy link
Member Author

roberth commented Oct 31, 2021

So ofborg has a build failure in these tests, but that doesn't matter. They now evaluate, unblocking the channel.

@roberth roberth merged commit 3028246 into NixOS:master Oct 31, 2021
@roberth
Copy link
Member Author

roberth commented Oct 31, 2021

The tests pass locally, so that's another reason to ignore ofborg's build failures.

@roberth
Copy link
Member Author

roberth commented Oct 31, 2021

Continued discussion: #140792 (comment)

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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant