mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
nixos/qemu-vm: default memorySize 384 -> 1024
the default hasn't been changed since 2009 this can improve our test performances nixos/tests: remove explicit memorySize <1024 1024MiB is now the default
This commit is contained in:
parent
5e560c4e24
commit
54ece050b8
@ -296,7 +296,7 @@ in
|
|||||||
virtualisation.memorySize =
|
virtualisation.memorySize =
|
||||||
mkOption {
|
mkOption {
|
||||||
type = types.ints.positive;
|
type = types.ints.positive;
|
||||||
default = 384;
|
default = 1024;
|
||||||
description =
|
description =
|
||||||
''
|
''
|
||||||
The memory size in megabytes of the virtual machine.
|
The memory size in megabytes of the virtual machine.
|
||||||
|
@ -11,10 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
enable = true;
|
enable = true;
|
||||||
maxMemory = 800;
|
maxMemory = 800;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Airsonic is a Java application, and unfortunately requires a significant
|
|
||||||
# amount of memory.
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
|
@ -17,7 +17,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||||||
program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24";
|
program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24";
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Cage can launch:
|
# Need to switch to a different GPU driver than the default one (-vga std) so that Cage can launch:
|
||||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||||
};
|
};
|
||||||
|
@ -35,7 +35,6 @@ in
|
|||||||
programs.xwayland.enable = true;
|
programs.xwayland.enable = true;
|
||||||
environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
|
environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch:
|
# Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch:
|
||||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||||
};
|
};
|
||||||
|
@ -41,7 +41,6 @@ let
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
services.cassandra = cassandraCfg ipAddress // extra;
|
services.cassandra = cassandraCfg ipAddress // extra;
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -37,7 +37,6 @@ let
|
|||||||
|
|
||||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
memorySize = 1024;
|
|
||||||
emptyDiskImages = [ 20480 ];
|
emptyDiskImages = [ 20480 ];
|
||||||
vlans = [ 1 ];
|
vlans = [ 1 ];
|
||||||
};
|
};
|
||||||
|
@ -34,7 +34,6 @@ let
|
|||||||
|
|
||||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
memorySize = 1024;
|
|
||||||
emptyDiskImages = [ 20480 20480 20480 ];
|
emptyDiskImages = [ 20480 20480 20480 ];
|
||||||
vlans = [ 1 ];
|
vlans = [ 1 ];
|
||||||
};
|
};
|
||||||
|
@ -34,7 +34,6 @@ let
|
|||||||
|
|
||||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
memorySize = 1024;
|
|
||||||
emptyDiskImages = [ 20480 20480 20480 ];
|
emptyDiskImages = [ 20480 20480 20480 ];
|
||||||
vlans = [ 1 ];
|
vlans = [ 1 ];
|
||||||
};
|
};
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
memorySize = 1024;
|
|
||||||
qemu.options = [ "-vga virtio" ];
|
qemu.options = [ "-vga virtio" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
|
|
||||||
networking.bridges = {
|
networking.bridges = {
|
||||||
br0 = {
|
br0 = {
|
||||||
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
machine = { pkgs, ... }: {
|
machine = { pkgs, ... }: {
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
|
|
||||||
containers.webserver = {
|
containers.webserver = {
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
virtualisation.vlans = [];
|
virtualisation.vlans = [];
|
||||||
|
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
machine =
|
machine =
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 256;
|
|
||||||
virtualisation.vlans = [];
|
virtualisation.vlans = [];
|
||||||
|
|
||||||
networking.bridges.br0.interfaces = [];
|
networking.bridges.br0.interfaces = [];
|
||||||
|
@ -14,7 +14,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
nix.binaryCaches = []; # don't try to access cache.nixos.org
|
nix.binaryCaches = []; # don't try to access cache.nixos.org
|
||||||
|
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
# Make sure we always have all the required dependencies for creating a
|
# Make sure we always have all the required dependencies for creating a
|
||||||
# container available within the VM, because we don't have network access.
|
# container available within the VM, because we don't have network access.
|
||||||
virtualisation.additionalPaths = let
|
virtualisation.additionalPaths = let
|
||||||
|
@ -22,7 +22,6 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
writableStore = true;
|
writableStore = true;
|
||||||
memorySize = 768;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
|
containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
|
||||||
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
machine1 =
|
machine1 =
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 256;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
# To be able to ping containers from the host, it is necessary
|
# To be able to ping containers from the host, it is necessary
|
||||||
@ -55,7 +54,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
machine2 =
|
machine2 =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 256;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
nodes = {
|
nodes = {
|
||||||
server = { ... }:
|
server = { ... }:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 256;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
containers.server = {
|
containers.server = {
|
||||||
@ -23,7 +22,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
bridged = { ... }: {
|
bridged = { ... }: {
|
||||||
virtualisation.memorySize = 128;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
containers.bridged = {
|
containers.bridged = {
|
||||||
@ -41,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
bonded = { ... }: {
|
bonded = { ... }: {
|
||||||
virtualisation.memorySize = 128;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
containers.bonded = {
|
containers.bonded = {
|
||||||
@ -62,7 +59,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
bridgedbond = { ... }: {
|
bridgedbond = { ... }: {
|
||||||
virtualisation.memorySize = 128;
|
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
containers.bridgedbond = {
|
containers.bridgedbond = {
|
||||||
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
|
|
||||||
containers.webserver =
|
containers.webserver =
|
||||||
{ privateNetwork = true;
|
{ privateNetwork = true;
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
|
|
||||||
containers.tmpfs =
|
containers.tmpfs =
|
||||||
{
|
{
|
||||||
|
@ -81,8 +81,6 @@ in
|
|||||||
|
|
||||||
# chromium-based browsers refuse to run as root
|
# chromium-based browsers refuse to run as root
|
||||||
test-support.displayManager.auto.user = "alice";
|
test-support.displayManager.auto.user = "alice";
|
||||||
# browsers may hang with the default memory
|
|
||||||
virtualisation.memorySize = 500;
|
|
||||||
|
|
||||||
networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
|
networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
|
||||||
security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];
|
security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];
|
||||||
|
@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
environment.systemPackages = [ pkgs.xdotool ];
|
environment.systemPackages = [ pkgs.xdotool ];
|
||||||
services.acpid.enable = true;
|
services.acpid.enable = true;
|
||||||
services.connman.enable = true;
|
services.connman.enable = true;
|
||||||
|
@ -11,7 +11,6 @@ import ../make-test-python.nix (
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../common/user-account.nix
|
../common/user-account.nix
|
||||||
|
@ -38,7 +38,6 @@ in
|
|||||||
gcc
|
gcc
|
||||||
(python3.withPackages (ps: with ps; [ fenics ]))
|
(python3.withPackages (ps: with ps; [ fenics ]))
|
||||||
];
|
];
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
testScript =
|
testScript =
|
||||||
|
@ -13,9 +13,6 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
|||||||
pkgs.xdotool
|
pkgs.xdotool
|
||||||
];
|
];
|
||||||
|
|
||||||
# Need some more memory to record audio.
|
|
||||||
virtualisation.memorySize = 500;
|
|
||||||
|
|
||||||
# Create a virtual sound device, with mixing
|
# Create a virtual sound device, with mixing
|
||||||
# and all, for recording audio.
|
# and all, for recording audio.
|
||||||
boot.kernelModules = [ "snd-aloop" ];
|
boot.kernelModules = [ "snd-aloop" ];
|
||||||
|
@ -18,7 +18,6 @@ in {
|
|||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
networking.firewall.allowedTCPPorts = [ 80 2222 ];
|
networking.firewall.allowedTCPPorts = [ 80 2222 ];
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
services.gerrit = {
|
services.gerrit = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
|
@ -45,7 +45,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
|
@ -4,7 +4,6 @@ import ./make-test-python.nix ({ pkgs, ... } :
|
|||||||
nodes = {
|
nodes = {
|
||||||
one =
|
one =
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
time.timeZone = "UTC";
|
time.timeZone = "UTC";
|
||||||
services.graphite = {
|
services.graphite = {
|
||||||
web = {
|
web = {
|
||||||
|
@ -95,7 +95,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
|||||||
|
|
||||||
# YARN cluster
|
# YARN cluster
|
||||||
rm1 = {pkgs, options, ...}: {
|
rm1 = {pkgs, options, ...}: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
services.hadoop = {
|
services.hadoop = {
|
||||||
inherit package coreSite hdfsSite;
|
inherit package coreSite hdfsSite;
|
||||||
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
||||||
@ -103,7 +102,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
rm2 = {pkgs, options, ...}: {
|
rm2 = {pkgs, options, ...}: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
services.hadoop = {
|
services.hadoop = {
|
||||||
inherit package coreSite hdfsSite;
|
inherit package coreSite hdfsSite;
|
||||||
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
import ../make-test-python.nix ({...}: {
|
import ../make-test-python.nix ({...}: {
|
||||||
nodes = {
|
nodes = {
|
||||||
namenode = {pkgs, ...}: {
|
namenode = {pkgs, ...}: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
services.hadoop = {
|
services.hadoop = {
|
||||||
package = pkgs.hadoop;
|
package = pkgs.hadoop;
|
||||||
hdfs = {
|
hdfs = {
|
||||||
|
@ -7,6 +7,5 @@ makeInstalledTest {
|
|||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
|
services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
|
||||||
services.fwupd.enableTestRemote = true;
|
services.fwupd.enableTestRemote = true;
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
client = { nodes, pkgs, ... }: {
|
client = { nodes, pkgs, ... }: {
|
||||||
};
|
};
|
||||||
server = { config, pkgs, ... }: {
|
server = { config, pkgs, ... }: {
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
services.jitsi-meet = {
|
services.jitsi-meet = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hostName = "server";
|
hostName = "server";
|
||||||
|
@ -19,7 +19,6 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 2181 ];
|
networking.firewall.allowedTCPPorts = [ 2181 ];
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
kafka = { ... }: {
|
kafka = { ... }: {
|
||||||
services.apache-kafka = {
|
services.apache-kafka = {
|
||||||
|
@ -17,7 +17,6 @@ let
|
|||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
keycloak = { ... }: {
|
keycloak = { ... }: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
security.pki.certificateFiles = [
|
security.pki.certificateFiles = [
|
||||||
certs.ca.cert
|
certs.ca.cert
|
||||||
|
@ -46,8 +46,6 @@ in {
|
|||||||
|
|
||||||
machine = { lib, ... }: {
|
machine = { lib, ... }: {
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
# OOMs otherwise
|
|
||||||
memorySize = 1024;
|
|
||||||
# disk full otherwise
|
# disk full otherwise
|
||||||
diskSize = 2048;
|
diskSize = 2048;
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
nodes = {
|
nodes = {
|
||||||
machine = { ... }: {
|
machine = { ... }: {
|
||||||
services.metabase.enable = true;
|
services.metabase.enable = true;
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -64,10 +64,6 @@ in
|
|||||||
{
|
{
|
||||||
imports = [ users ];
|
imports = [ users ];
|
||||||
|
|
||||||
# prevent oom:
|
|
||||||
# Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
services.mysql.enable = true;
|
services.mysql.enable = true;
|
||||||
services.mysql.initialDatabases = [
|
services.mysql.initialDatabases = [
|
||||||
{ name = "testdb3"; schema = ./testdb.sql; }
|
{ name = "testdb3"; schema = ./testdb.sql; }
|
||||||
|
@ -8,7 +8,6 @@ let default-config = {
|
|||||||
|
|
||||||
services.xserver.enable = false;
|
services.xserver.enable = false;
|
||||||
|
|
||||||
virtualisation.memorySize = 128;
|
|
||||||
};
|
};
|
||||||
in import ./make-test-python.nix ({ pkgs, ...} : {
|
in import ./make-test-python.nix ({ pkgs, ...} : {
|
||||||
name = "networking-proxy";
|
name = "networking-proxy";
|
||||||
|
@ -37,7 +37,6 @@ import ./make-test-python.nix {
|
|||||||
};
|
};
|
||||||
|
|
||||||
client = { pkgs, lib, ... }: {
|
client = { pkgs, lib, ... }: {
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
environment.systemPackages = let
|
environment.systemPackages = let
|
||||||
testRunner = pkgs.writers.writePython3Bin "test-runner" {
|
testRunner = pkgs.writers.writePython3Bin "test-runner" {
|
||||||
libraries = [ pkgs.python3Packages.selenium ];
|
libraries = [ pkgs.python3Packages.selenium ];
|
||||||
|
@ -26,7 +26,6 @@ let
|
|||||||
nix.binaryCaches = lib.mkForce [ ];
|
nix.binaryCaches = lib.mkForce [ ];
|
||||||
users.users.person.isNormalUser = true;
|
users.users.person.isNormalUser = true;
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
virtualisation.memorySize = 1024 /*MiB*/;
|
|
||||||
virtualisation.additionalPaths = [
|
virtualisation.additionalPaths = [
|
||||||
pkgs.hello
|
pkgs.hello
|
||||||
pkgs.figlet
|
pkgs.figlet
|
||||||
|
@ -39,7 +39,6 @@ import ./make-test-python.nix {
|
|||||||
|
|
||||||
smtp2 = { pkgs, ... }: {
|
smtp2 = { pkgs, ... }: {
|
||||||
imports = [ common/user-account.nix ];
|
imports = [ common/user-account.nix ];
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
networking = {
|
networking = {
|
||||||
firewall.allowedTCPPorts = [ 25 143 ];
|
firewall.allowedTCPPorts = [ 25 143 ];
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.desktopManager.pantheon.enable = true;
|
services.xserver.desktopManager.pantheon.enable = true;
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enableOCR = true;
|
enableOCR = true;
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||||||
enable = true;
|
enable = true;
|
||||||
passwordFile = builtins.toFile "password" "admin";
|
passwordFile = builtins.toFile "password" "admin";
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
|
@ -21,7 +21,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||||||
user = "alice";
|
user = "alice";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
|
@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||||||
user = "alice";
|
user = "alice";
|
||||||
};
|
};
|
||||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
|
@ -202,7 +202,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
|
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
|
||||||
networking.extraHosts = hosts nodes;
|
networking.extraHosts = hosts nodes;
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
provision-db
|
provision-db
|
||||||
provision-secrets
|
provision-secrets
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
|
|||||||
|
|
||||||
machine = { ... }: {
|
machine = { ... }: {
|
||||||
virtualisation.cores = 2;
|
virtualisation.cores = 2;
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
|
|
||||||
services.privacyidea = {
|
services.privacyidea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -464,7 +464,6 @@ let
|
|||||||
extraFlags = [ "--lnd.network=regtest" ];
|
extraFlags = [ "--lnd.network=regtest" ];
|
||||||
};
|
};
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
systemd.services.prometheus-lnd-exporter.serviceConfig.RestartSec = 15;
|
systemd.services.prometheus-lnd-exporter.serviceConfig.RestartSec = 15;
|
||||||
systemd.services.prometheus-lnd-exporter.after = [ "lnd.service" ];
|
systemd.services.prometheus-lnd-exporter.after = [ "lnd.service" ];
|
||||||
services.bitcoind.regtest = {
|
services.bitcoind.regtest = {
|
||||||
@ -953,7 +952,6 @@ let
|
|||||||
};
|
};
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
services.rspamd.enable = true;
|
services.rspamd.enable = true;
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
exporterTest = ''
|
exporterTest = ''
|
||||||
wait_for_unit("rspamd.service")
|
wait_for_unit("rspamd.service")
|
||||||
|
@ -188,7 +188,6 @@ in import ./make-test-python.nix {
|
|||||||
# Minio requires at least 1GiB of free disk space to run.
|
# Minio requires at least 1GiB of free disk space to run.
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
diskSize = 2 * 1024;
|
diskSize = 2 * 1024;
|
||||||
memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ minioPort ];
|
networking.firewall.allowedTCPPorts = [ minioPort ];
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@ let
|
|||||||
machine = {
|
machine = {
|
||||||
services.rspamd.enable = true;
|
services.rspamd.enable = true;
|
||||||
networking.enableIPv6 = enableIPv6;
|
networking.enableIPv6 = enableIPv6;
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
testScript = ''
|
testScript = ''
|
||||||
start_all()
|
start_all()
|
||||||
@ -69,7 +68,6 @@ in
|
|||||||
group = "rspamd";
|
group = "rspamd";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
@ -118,7 +116,6 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
@ -224,7 +221,6 @@ in
|
|||||||
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
|
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
testScript = ''
|
testScript = ''
|
||||||
${initMachine}
|
${initMachine}
|
||||||
@ -291,7 +287,6 @@ in
|
|||||||
postfix.enable = true;
|
postfix.enable = true;
|
||||||
workers.rspamd_proxy.type = "rspamd_proxy";
|
workers.rspamd_proxy.type = "rspamd_proxy";
|
||||||
};
|
};
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
testScript = ''
|
testScript = ''
|
||||||
${initMachine}
|
${initMachine}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import ./make-test-python.nix ({ pkgs, ... }:
|
import ./make-test-python.nix ({ pkgs, ... }:
|
||||||
let
|
let
|
||||||
client = { config, pkgs, ... }: {
|
client = { config, pkgs, ... }: {
|
||||||
virtualisation.memorySize = 256;
|
|
||||||
environment.systemPackages = [ pkgs.seafile-shared pkgs.curl ];
|
environment.systemPackages = [ pkgs.seafile-shared pkgs.curl ];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
@ -12,7 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
server = { config, pkgs, ... }: {
|
server = { config, pkgs, ... }: {
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
services.seafile = {
|
services.seafile = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ccnetSettings.General.SERVICE_URL = "http://server";
|
ccnetSettings.General.SERVICE_URL = "http://server";
|
||||||
|
@ -29,7 +29,6 @@ in {
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
signal-desktop file sqlite sqlcipher-signal
|
signal-desktop file sqlite sqlcipher-signal
|
||||||
];
|
];
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enableOCR = true;
|
enableOCR = true;
|
||||||
|
@ -3,7 +3,6 @@ import ../make-test-python.nix ({...}: {
|
|||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
worker = { nodes, pkgs, ... }: {
|
worker = { nodes, pkgs, ... }: {
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
services.spark.worker = {
|
services.spark.worker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
master = "master:7077";
|
master = "master:7077";
|
||||||
|
@ -44,7 +44,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||||||
# To test pinentry via gpg-agent:
|
# To test pinentry via gpg-agent:
|
||||||
programs.gnupg.agent.enable = true;
|
programs.gnupg.agent.enable = true;
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
|
# Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
|
||||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||||
};
|
};
|
||||||
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
machine =
|
machine =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
services.sympa = {
|
services.sympa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
emptyDiskImages = [ 512 ];
|
emptyDiskImages = [ 512 ];
|
||||||
memorySize = 1024;
|
|
||||||
qemu.options = [
|
qemu.options = [
|
||||||
"-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"
|
"-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"
|
||||||
"-tpmdev emulator,id=tpm0,chardev=chrtpm"
|
"-tpmdev emulator,id=tpm0,chardev=chrtpm"
|
||||||
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
imports = [ common/user-account.nix common/x11.nix ];
|
imports = [ common/user-account.nix common/x11.nix ];
|
||||||
|
|
||||||
virtualisation.emptyDiskImages = [ 512 512 ];
|
virtualisation.emptyDiskImages = [ 512 512 ];
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||||
|
|
||||||
|
@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
maintainers = [ lnl7 roberth ];
|
maintainers = [ lnl7 roberth ];
|
||||||
};
|
};
|
||||||
machine = { lib, pkgs, ... }: {
|
machine = { lib, pkgs, ... }: {
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
environment.systemPackages = [ pkgs.vault ];
|
environment.systemPackages = [ pkgs.vault ];
|
||||||
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
||||||
services.vault.enable = true;
|
services.vault.enable = true;
|
||||||
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
environment.systemPackages = [ pkgs.vault ];
|
environment.systemPackages = [ pkgs.vault ];
|
||||||
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
||||||
services.vault.enable = true;
|
services.vault.enable = true;
|
||||||
virtualisation.memorySize = 512;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript =
|
testScript =
|
||||||
|
@ -140,7 +140,6 @@ let
|
|||||||
in
|
in
|
||||||
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
|
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
|
||||||
|
|
||||||
virtualisation.memorySize = 768;
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||||||
|
|
||||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
|
Loading…
Reference in New Issue
Block a user