Unverified Commit 3cc7cbce authored by Minijackson's avatar Minijackson
Browse files

netbox_3_6: init, mark 3_5 as EOL 



use it for the upgrade test
increase tests memory, otherwise NetBox gets OOM killed

Co-authored-by: default avatarRaito Bezarius <masterancpp@gmail.com>
parent 6c7e7684

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ in { 
  networking.scripted = handleTest ./networking.nix { networkd = false; };

  netbox_3_5 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_5; };

  netbox_3_3 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_3; };

  netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; };

  netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {};

  # TODO: put in networking.nix after the test becomes more complete

  networkingProxy = handleTest ./networking-proxy.nix {};

nixos/tests/web-apps/netbox-upgrade.nix

+3 −2
Original line number Diff line number Diff line 
import ../make-test-python.nix ({ lib, pkgs, ... }: let

  oldNetbox = pkgs.netbox_3_3;

  newNetbox = pkgs.netbox_3_5;

  oldNetbox = pkgs.netbox_3_5;

  newNetbox = pkgs.netbox_3_6;

in {

  name = "netbox-upgrade";
@@ -9,6 +9,7 @@ in { 
  };



  nodes.machine = { config, ... }: {

    virtualisation.memorySize = 2048;

    services.netbox = {

      enable = true;

      package = oldNetbox;

nixos/tests/web-apps/netbox.nix

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ in import ../make-test-python.nix ({ lib, pkgs, netbox, ... }: { 
  };



  nodes.machine = { config, ... }: {

    virtualisation.memorySize = 2048;

    services.netbox = {

      enable = true;

      package = netbox;

pkgs/servers/web-apps/netbox/default.nix

+17 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ let 
  generic = import ./generic.nix;

in

lib.fix (self: {

  netbox = self.netbox_3_5;

  netbox = self.netbox_3_6;



  netbox_3_3 = callPackage generic {

    version = "3.3.10";
@@ -39,6 +39,22 @@ lib.fix (self: { 
      inherit (nixosTests) netbox-upgrade;

    };



    maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ];

    eol = true;

  };



  netbox_3_6 = callPackage generic {

    version = "3.6.2";

    hash = "sha256-iKYzeiaJhF8T+qbft6fS1PjHyPxxQm86om9YpAGnvYE=";

    extraPatches = [

      # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL

      ./config.patch

    ];

    tests = {

      netbox = nixosTests.netbox_3_6;

      inherit (nixosTests) netbox-upgrade;

    };



    maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ];

  };

})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -11073,7 +11073,7 @@ with pkgs; 
  netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };















  inherit (callPackage ../servers/web-apps/netbox { })













    netbox netbox_3_3 netbox_3_5;













    netbox netbox_3_3 netbox_3_5 netbox_3_6;





























  netbox2netshot = callPackage ../tools/admin/netbox2netshot { };