Fediversity/Fediversity
13
2
Fork 6
Code Issues 111 Pull requests 15 Projects 1 Activity Actions

Restrict fileset necessary for deployment tests #450

Merged
fricklerhandwerk merged 3 commits from Niols/Fediversity:restrict-filesets-2 into main 2025-07-09 22:57:54 +02:00
Conversation 3 Commits 3 Files changed 4 +17 -3
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 44e3e5db4c - Show all commits

7
deployment/check/basic/nixosTest.nix
View file

@ -1,10 +1,15 @@
{ inputs, ... }:
{ inputs, lib, ... }:
{
_class = "nixosTest";
name = "deployment-basic";
sourceFileset = lib.fileset.unions [
./constants.nix
./deployment.nix
];
nodes.deployer =
{ pkgs, ... }:
{

3
deployment/check/cli/nixosTest.nix
View file

@ -17,6 +17,9 @@ in
name = "deployment-cli";
sourceFileset = lib.fileset.unions [
./constants.nix
./deployments.nix
fricklerhandwerk marked this conversation as resolved Outdated
fricklerhandwerk commented 2025-07-09 11:26:49 +02:00
Outdated
Review
Copy link

But you can literally lib.fileset.subtract <this> <deployment/check> -- today!

But you can literally `lib.fileset.subtract <this> <deployment/check>` -- today!
Niols commented 2025-07-09 11:29:52 +02:00
Outdated
Review
Copy link

I know, this is not what the comment is about!

but I can't because there is a bunch of other files in /deployment.

If I take /deployment minus /deployment/check, I grab all the data model stuff as well, and I don't want that.

I know, this is not what the comment is about! > but I can't because there is a bunch of other files in `/deployment`. If I take `/deployment` minus `/deployment/check`, I grab all the data model stuff as well, and I don't want that.
fricklerhandwerk commented 2025-07-09 11:46:21 +02:00
Outdated
Review
Copy link

Ah got it

Ah got it
# REVIEW: I would like to be able to grab all of `/deployment` minus
# `/deployment/check`, but I can't because there is a bunch of other files
# in `/deployment`. Maybe we can think of a reorg making things more robust

7
deployment/check/common/nixosTest.nix
View file

@ -72,8 +72,11 @@ in
../../../flake.lock
../../../npins
./.
config.pathToCwd
./sharedOptions.nix
./targetNode.nix
./targetResource.nix
(config.pathToCwd + "/flake-under-test.nix")
];
acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;

3
deployment/check/panel/nixosTest.nix
View file

@ -126,6 +126,9 @@ in
name = "deployment-panel";
sourceFileset = lib.fileset.unions [
./constants.nix
./deployment.nix
# REVIEW: I would like to be able to grab all of `/deployment` minus
# `/deployment/check`, but I can't because there is a bunch of other files
# in `/deployment`. Maybe we can think of a reorg making things more robust