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

nixos/strongswan: improve testing of both swanctl and base strongswan module #370840

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

johanot
Copy link
Contributor

@johanot johanot commented Jan 4, 2025

Would like to see #362302 and #370067 merged. But I would also like to improve testing before approving.

This PR:

  • Adds a new test case for the strongswan module
  • Prepares the new test as well as the existing swanctl test for testing with multiple packages

cc @NickCao

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 4, 2025
@johanot
Copy link
Contributor Author

johanot commented Jan 4, 2025

@GrahamcOfBorg test strongswan

@johanot
Copy link
Contributor Author

johanot commented Jan 4, 2025

@ofborg test strongswan

@lucasew
Copy link
Contributor

lucasew commented Jan 4, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370840


x86_64-linux

✅ 2 tests built:
  • nixosTests.strongswan.strongswan-strongswan
  • nixosTests.strongswan.strongswan-swanctl

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 4, 2025
@@ -81,6 +82,8 @@ in
options.services.strongswan = {
enable = mkEnableOption "strongSwan";

package = mkPackageOption pkgs "strongswan" { };
Copy link
Member

Choose a reason for hiding this comment

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

Where is the package option used?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's not being used. The unit is referencing pkgs directly, and there is a with cfg there.

Copy link
Member

Choose a reason for hiding this comment

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

It's not being used. The unit is referencing pkgs directly, and there is a with cfg there.

Then these pkgs.strongswan should be replaced with cfg.package.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, thanks :) I just failed at git add -p

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's fixed now: 25ecc0e

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 5, 2025
@lucasew
Copy link
Contributor

lucasew commented Jan 5, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370840


x86_64-linux

✅ 2 tests built:
  • nixosTests.strongswan.strongswan-strongswan
  • nixosTests.strongswan.strongswan-swanctl

@johanot johanot requested a review from NickCao January 6, 2025 08:40
@NickCao NickCao mentioned this pull request Jan 12, 2025
13 tasks
@johanot johanot mentioned this pull request Jan 12, 2025
13 tasks
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 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants