diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-02-25 09:55:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-25 09:55:43 +0800 |
| commit | eb03dde70d5b324eea32b8039abb0c37a80e44aa (patch) | |
| tree | 80d87426981f665da67a509ff995d2b938f9a872 /nixos | |
| parent | 75be28501e004a9e1a16b2b95e5fe524476de9c9 (diff) | |
| parent | 1b304e1dbc1c37f73e5a82e547fea58bc57ad10a (diff) | |
Merge pull request #217890 from IndeedNotJames/nixos-tests-gitea
nixos/tests/gitea: open up test for forgejo
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/all-tests.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/gitea.nix | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ecf95c2cba0a4..785a5621f57eb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -228,6 +228,7 @@ in { fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; + forgejo = handleTest ./gitea.nix { giteaPackage = pkgs.forgejo; }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; @@ -241,7 +242,7 @@ in { geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; - gitea = handleTest ./gitea.nix {}; + gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 68a2566c11911..d856ecca9a132 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -1,5 +1,6 @@ { system ? builtins.currentSystem, config ? {}, + giteaPackage, pkgs ? import ../.. { inherit system config; } }: @@ -9,8 +10,8 @@ with pkgs.lib; let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { - name = "gitea-${type}"; - meta.maintainers = with maintainers; [ aanderse kolaente ma27 ]; + name = "${giteaPackage.pname}-${type}"; + meta.maintainers = with maintainers; [ aanderse indeednotjames kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { @@ -18,9 +19,10 @@ let services.gitea = { enable = true; database = { inherit type; }; + package = giteaPackage; settings.service.DISABLE_REGISTRATION = true; }; - environment.systemPackages = [ pkgs.gitea pkgs.jq ]; + environment.systemPackages = [ giteaPackage pkgs.jq ]; services.openssh.enable = true; }; client1 = { config, pkgs, ... }: { |