privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

packages/checks/{ascensions,garage}: use our consul package

Browse source
This commit is contained in:
Max Headroom 2024-06-04 14:52:15 +02:00
parent 7f9881e932
commit ae4385d6d3
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/checks/ascensions.nix
View file

@ -1,4 +1,4 @@
{ testers, nixosModules }: { testers, nixosModules, consul }:
let let
dataDir = { dataDir = {
@ -18,6 +18,8 @@ testers.runNixOSTest {
./modules/consul.nix ./modules/consul.nix
]; ];
extraBaseModules.services.consul.package = consul;
nodes = let nodes = let
common = { config, lib, ... }: let common = { config, lib, ... }: let
inherit (config.networking) hostName; inherit (config.networking) hostName;

3
packages/checks/default.nix
View file

@ -4,11 +4,12 @@
perSystem = { filters, pkgs, self', system, ... }: { perSystem = { filters, pkgs, self', system, ... }: {
checks = lib.mkIf (system == "x86_64-linux") { checks = lib.mkIf (system == "x86_64-linux") {
ascensions = pkgs.callPackage ./ascensions.nix { ascensions = pkgs.callPackage ./ascensions.nix {
inherit (self'.packages) consul;
inherit (self) nixosModules; inherit (self) nixosModules;
}; };
garage = pkgs.callPackage ./garage.nix { garage = pkgs.callPackage ./garage.nix {
inherit (self'.packages) garage; inherit (self'.packages) garage consul;
inherit (self) nixosModules; inherit (self) nixosModules;
inherit (config) cluster; inherit (config) cluster;
}; };

4
packages/checks/garage.nix
View file

@ -1,4 +1,4 @@
{ testers, nixosModules, cluster, garage }: { testers, nixosModules, cluster, garage, consul }:
testers.runNixOSTest { testers.runNixOSTest {
name = "garage"; name = "garage";
@ -7,6 +7,8 @@ testers.runNixOSTest {
./modules/consul.nix ./modules/consul.nix
]; ];
extraBaseModules.services.consul.package = consul;
nodes = let nodes = let
common = { config, lib, ... }: let common = { config, lib, ... }: let
inherit (config.networking) hostName primaryIPAddress; inherit (config.networking) hostName primaryIPAddress;