From 8c66d90ba8a47443776c31abe55f32fc2803b150 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Mon, 1 Sep 2025 14:48:40 +0200 Subject: [PATCH] restore path-based behavior for non-data-model tests --- deployment/check/basic/constants.nix | 7 ++----- deployment/check/cli/constants.nix | 7 ++----- deployment/check/data-model-nixops4/constants.nix | 7 ++----- deployment/check/panel/constants.nix | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/deployment/check/basic/constants.nix b/deployment/check/basic/constants.nix index 18b163b8..f2573fb8 100644 --- a/deployment/check/basic/constants.nix +++ b/deployment/check/basic/constants.nix @@ -3,10 +3,7 @@ "hello" "cowsay" ]; - pathToRoot = builtins.path { - path = ../../..; - name = "root"; - }; - pathFromRoot = "/deployment/check/data-model-ssh"; + pathToRoot = ../../..; + pathFromRoot = ./.; useFlake = true; } diff --git a/deployment/check/cli/constants.nix b/deployment/check/cli/constants.nix index 84885019..a48d9076 100644 --- a/deployment/check/cli/constants.nix +++ b/deployment/check/cli/constants.nix @@ -5,11 +5,8 @@ "peertube" "pixelfed" ]; - pathToRoot = builtins.path { - path = ../../..; - name = "root"; - }; - pathFromRoot = "/deployment/check/data-model-ssh"; + pathToRoot = ../../..; + pathFromRoot = ./.; enableAcme = true; useFlake = true; } diff --git a/deployment/check/data-model-nixops4/constants.nix b/deployment/check/data-model-nixops4/constants.nix index 34a3058a..548d6605 100644 --- a/deployment/check/data-model-nixops4/constants.nix +++ b/deployment/check/data-model-nixops4/constants.nix @@ -2,11 +2,8 @@ targetMachines = [ "nixops4" ]; - pathToRoot = builtins.path { - path = ../../..; - name = "root"; - }; - pathFromRoot = "/deployment/check/data-model-ssh"; + pathToRoot = ../../..; + pathFromRoot = ./.; enableAcme = true; useFlake = true; } diff --git a/deployment/check/panel/constants.nix b/deployment/check/panel/constants.nix index 84885019..a48d9076 100644 --- a/deployment/check/panel/constants.nix +++ b/deployment/check/panel/constants.nix @@ -5,11 +5,8 @@ "peertube" "pixelfed" ]; - pathToRoot = builtins.path { - path = ../../..; - name = "root"; - }; - pathFromRoot = "/deployment/check/data-model-ssh"; + pathToRoot = ../../..; + pathFromRoot = ./.; enableAcme = true; useFlake = true; }