move CI to garnix (#210)

ibizaman · Mar 20, 2024 · c75daa2 · c75daa2
1 parent f8636e2
commit c75daa2
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 136 deletions.
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
diff --git a/.github/workflows/garnix.yaml b/.github/workflows/garnix.yaml
@@ -0,0 +1,20 @@
+name: "Final Results"
+
+on:
+  check_suite:
+    types: [completed]
+
+jobs:
+  results:
+    name: Final Results
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo
+      - run: exit 1
+        # see https://stackoverflow.com/a/67532120/4907315
+        if: >-
+          ${{
+               contains(needs.*.result, 'failure')
+            || contains(needs.*.result, 'cancelled')
+            || contains(needs.*.result, 'skipped')
+          }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 [![Tests](https://github.com/ibizaman/selfhostblocks/actions/workflows/test.yml/badge.svg)](https://github.com/ibizaman/selfhostblocks/actions/workflows/test.yml)
 [![Demo](https://github.com/ibizaman/selfhostblocks/actions/workflows/demo.yml/badge.svg)](https://github.com/ibizaman/selfhostblocks/actions/workflows/demo.yml)
 [![Documentation](https://github.com/ibizaman/selfhostblocks/actions/workflows/docs.yml/badge.svg)](https://github.com/ibizaman/selfhostblocks/actions/workflows/docs.yml)
+[![Tests](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fgarnix.io%2Fapi%2Fbadges%2Fibizaman%2Fselfhostblocks)](https://garnix.io) (using Garnix)
 
 SHB's (Self Host Blocks) is yet another server management tool whose goal is to provide a lower
 entry-bar for self-hosting. SHB provides opinionated [building blocks](#available-blocks) fitting

diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix
@@ -608,7 +608,7 @@ in
 
       environment.systemPackages = [
         # Needed for a few apps. Would be nice to avoid having to put that in the environment and instead override https://github.com/NixOS/nixpkgs/blob/261abe8a44a7e8392598d038d2e01f7b33cf26d0/nixos/modules/services/web-apps/nextcloud.nix#L1035
-        pkgs.ffmpeg
+        pkgs.ffmpeg-headless
 
         # Needed for the recognize app.
         pkgs.nodejs

diff --git a/test/vm/arr.nix b/test/vm/arr.nix
@@ -1,5 +1,6 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
   # TODO: Test login
   commonTestScript = appname: { nodes, ... }:
     let
@@ -44,7 +45,7 @@ let
             raise Exception(f"Code is {response['code']}")
     '';
 
-  basic = appname: pkgs.nixosTest {
+  basic = appname: pkgs.testers.runNixOSTest {
     name = "arr-${appname}-basic";
 
     nodes.server = { config, pkgs, ... }: {
@@ -58,6 +59,8 @@ let
         ../../modules/blocks/postgresql.nix
         ../../modules/blocks/nginx.nix
         ../../modules/services/arr.nix
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
       ];
 
       shb.arr.${appname} = {

diff --git a/test/vm/audiobookshelf.nix b/test/vm/audiobookshelf.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
+
   # TODO: Test login
   commonTestScript = { nodes, ... }:
     let
@@ -38,11 +40,13 @@ let
     '';
 in
 {
-  basic = pkgs.nixosTest {
+  basic = pkgs.testers.runNixOSTest {
     name = "audiobookshelf-basic";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -66,11 +70,13 @@ in
     testScript = commonTestScript;
   };
 
-  cert = pkgs.nixosTest {
+  cert = pkgs.testers.runNixOSTest {
     name = "audiobookshelf-cert";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -115,11 +121,13 @@ in
     testScript = commonTestScript;
   };
 
-  sso = pkgs.nixosTest {
+  sso = pkgs.testers.runNixOSTest {
     name = "audiobookshelf-sso";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };

diff --git a/test/vm/authelia.nix b/test/vm/authelia.nix
@@ -1,13 +1,17 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
+
   ldapAdminPassword = "ldapAdminPassword";
 in
 {
-  basic = pkgs.nixosTest {
+  basic = pkgs.testers.runNixOSTest {
     name = "authelia-basic";
 
     nodes.machine = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };

diff --git a/test/vm/grocy.nix b/test/vm/grocy.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
+
   # TODO: Test login
   commonTestScript = { nodes, ... }:
     let
@@ -38,11 +40,13 @@ let
     '';
 in
 {
-  basic = pkgs.nixosTest {
+  basic = pkgs.testers.runNixOSTest {
     name = "grocy-basic";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -65,11 +69,13 @@ in
     testScript = commonTestScript;
   };
 
-  cert = pkgs.nixosTest {
+  cert = pkgs.testers.runNixOSTest {
     name = "grocy-cert";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };

diff --git a/test/vm/jellyfin.nix b/test/vm/jellyfin.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
+
   # TODO: Test login
   commonTestScript = { nodes, ... }:
     let
@@ -38,11 +40,13 @@ let
     '';
 in
 {
-  basic = pkgs.nixosTest {
+  basic = pkgs.testers.runNixOSTest {
     name = "jellyfin-basic";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -66,11 +70,13 @@ in
     testScript = commonTestScript;
   };
 
-  ldap = pkgs.nixosTest {
+  ldap = pkgs.testers.runNixOSTest {
     name = "jellyfin-ldap";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -114,11 +120,13 @@ in
     testScript = commonTestScript;
   };
 
-  cert = pkgs.nixosTest {
+  cert = pkgs.testers.runNixOSTest {
     name = "jellyfin_cert";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };
@@ -164,11 +172,13 @@ in
     testScript = commonTestScript;
   };
 
-  sso = pkgs.nixosTest {
+  sso = pkgs.testers.runNixOSTest {
     name = "jellyfin_sso";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.backup = lib.mkOption { type = lib.types.anything; };

diff --git a/test/vm/ldap.nix b/test/vm/ldap.nix
@@ -1,10 +1,15 @@
 { pkgs, lib, ... }:
+let
+  pkgs' = pkgs;
+in
 {
-  auth = pkgs.nixosTest {
+  auth = pkgs.testers.runNixOSTest {
     name = "ldap-auth";
 
     nodes.server = { config, pkgs, ... }: {
       imports = [
+        (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+        (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
         {
           options = {
             shb.ssl.enable = lib.mkEnableOption "ssl";

diff --git a/test/vm/lib.nix b/test/vm/lib.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, ... }:
 let
+  pkgs' = pkgs;
+
   shblib = pkgs.callPackage ../../lib {};
 in
 {
@@ -40,11 +42,13 @@ in
         generator = lib.generators.toJSON {};
       };
     in
-      pkgs.nixosTest {
+      pkgs.testers.runNixOSTest {
         name = "lib-template";
         nodes.machine = { config, pkgs, ... }:
           {
             imports = [
+              (pkgs'.path + "/nixos/modules/profiles/headless.nix")
+              (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix")
               {
                 options = {
                   libtest.config = lib.mkOption {