nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 22:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/qemu-vm: default memorySize 384 -> 1024

Browse Source 
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:
Artturin 2021-11-20 23:26:46 +02:00
parent 5e560c4e24
commit 54ece050b8
61 changed files with 1 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -296,7 +296,7 @@ in
virtualisation.memorySize =
mkOption {
type = types.ints.positive;
default = 384;
default = 1024;
description =
''
The memory size in megabytes of the virtual machine.

4
nixos/tests/airsonic.nix
View File

@ -11,10 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
enable = true;
maxMemory = 800;
};
# Airsonic is a Java application, and unfortunately requires a significant
# amount of memory.
virtualisation.memorySize = 1024;
};
testScript = ''

1
nixos/tests/cage.nix
View File

@ -17,7 +17,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
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:
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
};

1
nixos/tests/cagebreak.nix
View File

@ -35,7 +35,6 @@ in
programs.xwayland.enable = true;
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:
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
};

1
nixos/tests/cassandra.nix
View File

@ -41,7 +41,6 @@ let
];
};
services.cassandra = cassandraCfg ipAddress // extra;
virtualisation.memorySize = 1024;
};
in
{

1
nixos/tests/ceph-multi-node.nix
View File

@ -37,7 +37,6 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = {
memorySize = 1024;
emptyDiskImages = [ 20480 ];
vlans = [ 1 ];
};

1
nixos/tests/ceph-single-node-bluestore.nix
View File

@ -34,7 +34,6 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = {
memorySize = 1024;
emptyDiskImages = [ 20480 20480 20480 ];
vlans = [ 1 ];
};

1
nixos/tests/ceph-single-node.nix
View File

@ -34,7 +34,6 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = {
memorySize = 1024;
emptyDiskImages = [ 20480 20480 20480 ];
vlans = [ 1 ];
};

1
nixos/tests/common/wayland-cage.nix
View File

@ -8,7 +8,6 @@
};
virtualisation = {
memorySize = 1024;
qemu.options = [ "-vga virtio" ];
};
}

1
nixos/tests/containers-bridge.nix
View File

@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
{ pkgs, ... }:
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
virtualisation.writableStore = true;
virtualisation.memorySize = 768;
networking.bridges = {
br0 = {

1
nixos/tests/containers-ephemeral.nix
View File

@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
machine = { pkgs, ... }: {
virtualisation.memorySize = 768;
virtualisation.writableStore = true;
containers.webserver = {

1
nixos/tests/containers-extra_veth.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
{ pkgs, ... }:
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
virtualisation.writableStore = true;
virtualisation.memorySize = 768;
virtualisation.vlans = [];
networking.useDHCP = false;

1
nixos/tests/containers-hosts.nix
View File

@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine =
{ lib, ... }:
{
virtualisation.memorySize = 256;
virtualisation.vlans = [];
networking.bridges.br0.interfaces = [];

1
nixos/tests/containers-imperative.nix
View File

@ -14,7 +14,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
nix.binaryCaches = []; # don't try to access cache.nixos.org
virtualisation.writableStore = true;
virtualisation.memorySize = 1024;
# Make sure we always have all the required dependencies for creating a
# container available within the VM, because we don't have network access.
virtualisation.additionalPaths = let

1
nixos/tests/containers-ip.nix
View File

@ -22,7 +22,6 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
imports = [ ../modules/installer/cd-dvd/channel.nix ];
virtualisation = {
writableStore = true;
memorySize = 768;
};
containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";

2
nixos/tests/containers-macvlans.nix
View File

@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine1 =
{ lib, ... }:
{
virtualisation.memorySize = 256;
virtualisation.vlans = [ 1 ];
# To be able to ping containers from the host, it is necessary
@ -55,7 +54,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine2 =
{ ... }:
{
virtualisation.memorySize = 256;
virtualisation.vlans = [ 1 ];
};

4
nixos/tests/containers-physical_interfaces.nix
View File

@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
nodes = {
server = { ... }:
{
virtualisation.memorySize = 256;
virtualisation.vlans = [ 1 ];
containers.server = {
@ -23,7 +22,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
};
bridged = { ... }: {
virtualisation.memorySize = 128;
virtualisation.vlans = [ 1 ];
containers.bridged = {
@ -41,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
bonded = { ... }: {
virtualisation.memorySize = 128;
virtualisation.vlans = [ 1 ];
containers.bonded = {
@ -62,7 +59,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
bridgedbond = { ... }: {
virtualisation.memorySize = 128;
virtualisation.vlans = [ 1 ];
containers.bridgedbond = {

1
nixos/tests/containers-portforward.nix
View File

@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
{ pkgs, ... }:
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
virtualisation.writableStore = true;
virtualisation.memorySize = 768;
containers.webserver =
{ privateNetwork = true;

1
nixos/tests/containers-tmpfs.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
{ pkgs, ... }:
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
virtualisation.writableStore = true;
virtualisation.memorySize = 768;
containers.tmpfs =
{

2
nixos/tests/custom-ca.nix
View File

@ -81,8 +81,6 @@ in
# chromium-based browsers refuse to run as root
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" ];
security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];

1
nixos/tests/enlightenment.nix
View File

@ -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
virtualisation.memorySize = 1024;
environment.systemPackages = [ pkgs.xdotool ];
services.acpid.enable = true;
services.connman.enable = true;

1
nixos/tests/fcitx/default.nix
View File

@ -11,7 +11,6 @@ import ../make-test-python.nix (
...
}:
{
virtualisation.memorySize = 1024;
imports = [
../common/user-account.nix

1
nixos/tests/fenics.nix
View File

@ -38,7 +38,6 @@ in
gcc
(python3.withPackages (ps: with ps; [ fenics ]))
];
virtualisation.memorySize = 512;
};
};
testScript =

3
nixos/tests/firefox.nix
View File

@ -13,9 +13,6 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
pkgs.xdotool
];
# Need some more memory to record audio.
virtualisation.memorySize = 500;
# Create a virtual sound device, with mixing
# and all, for recording audio.
boot.kernelModules = [ "snd-aloop" ];

1
nixos/tests/gerrit.nix
View File

@ -18,7 +18,6 @@ in {
{ config, pkgs, ... }: {
networking.firewall.allowedTCPPorts = [ 80 2222 ];
virtualisation.memorySize = 1024;
services.gerrit = {
enable = true;

1
nixos/tests/gnome-xorg.nix
View File

@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
};
};
virtualisation.memorySize = 1024;
};
testScript = { nodes, ... }: let

1
nixos/tests/gnome.nix
View File

@ -45,7 +45,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
};
};
virtualisation.memorySize = 1024;
};
testScript = { nodes, ... }: let

1
nixos/tests/graphite.nix
View File

@ -4,7 +4,6 @@ import ./make-test-python.nix ({ pkgs, ... } :
nodes = {
one =
{ ... }: {
virtualisation.memorySize = 1024;
time.timeZone = "UTC";
services.graphite = {
web = {

2
nixos/tests/hadoop/hadoop.nix
View File

@ -95,7 +95,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
# YARN cluster
rm1 = {pkgs, options, ...}: {
virtualisation.memorySize = 1024;
services.hadoop = {
inherit package coreSite hdfsSite;
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
@ -103,7 +102,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
};
};
rm2 = {pkgs, options, ...}: {
virtualisation.memorySize = 1024;
services.hadoop = {
inherit package coreSite hdfsSite;
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;

1
nixos/tests/hadoop/hdfs.nix
View File

@ -2,7 +2,6 @@
import ../make-test-python.nix ({...}: {
nodes = {
namenode = {pkgs, ...}: {
virtualisation.memorySize = 1024;
services.hadoop = {
package = pkgs.hadoop;
hdfs = {

1
nixos/tests/installed-tests/fwupd.nix
View File

@ -7,6 +7,5 @@ makeInstalledTest {
services.fwupd.enable = true;
services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
services.fwupd.enableTestRemote = true;
virtualisation.memorySize = 768;
};
}

1
nixos/tests/jitsi-meet.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
client = { nodes, pkgs, ... }: {
};
server = { config, pkgs, ... }: {
virtualisation.memorySize = 512;
services.jitsi-meet = {
enable = true;
hostName = "server";

1
nixos/tests/kafka.nix
View File

@ -19,7 +19,6 @@ let
};
networking.firewall.allowedTCPPorts = [ 2181 ];
virtualisation.memorySize = 1024;
};
kafka = { ... }: {
services.apache-kafka = {

1
nixos/tests/keycloak.nix
View File

@ -17,7 +17,6 @@ let
nodes = {
keycloak = { ... }: {
virtualisation.memorySize = 1024;
security.pki.certificateFiles = [
certs.ca.cert

2
nixos/tests/lxd-image.nix
View File

@ -46,8 +46,6 @@ in {
machine = { lib, ... }: {
virtualisation = {
# OOMs otherwise
memorySize = 1024;
# disk full otherwise
diskSize = 2048;

1
nixos/tests/metabase.nix
View File

@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
nodes = {
machine = { ... }: {
services.metabase.enable = true;
virtualisation.memorySize = 1024;
};
};

4
nixos/tests/mysql/mysql.nix
View File

@ -64,10 +64,6 @@ in
{
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.initialDatabases = [
{ name = "testdb3"; schema = ./testdb.sql; }

1
nixos/tests/networking-proxy.nix
View File

@ -8,7 +8,6 @@ let default-config = {
services.xserver.enable = false;
virtualisation.memorySize = 128;
};
in import ./make-test-python.nix ({ pkgs, ...} : {
name = "networking-proxy";

1
nixos/tests/nginx-etag.nix
View File

@ -37,7 +37,6 @@ import ./make-test-python.nix {
};
client = { pkgs, lib, ... }: {
virtualisation.memorySize = 512;
environment.systemPackages = let
testRunner = pkgs.writers.writePython3Bin "test-runner" {
libraries = [ pkgs.python3Packages.selenium ];

1
nixos/tests/nixops/default.nix
View File

@ -26,7 +26,6 @@ let
nix.binaryCaches = lib.mkForce [ ];
users.users.person.isNormalUser = true;
virtualisation.writableStore = true;
virtualisation.memorySize = 1024 /*MiB*/;
virtualisation.additionalPaths = [
pkgs.hello
pkgs.figlet

1
nixos/tests/opensmtpd-rspamd.nix
View File

@ -39,7 +39,6 @@ import ./make-test-python.nix {
smtp2 = { pkgs, ... }: {
imports = [ common/user-account.nix ];
virtualisation.memorySize = 512;
networking = {
firewall.allowedTCPPorts = [ 25 143 ];
useDHCP = false;

1
nixos/tests/pantheon.nix
View File

@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
services.xserver.enable = true;
services.xserver.desktopManager.pantheon.enable = true;
virtualisation.memorySize = 1024;
};
enableOCR = true;

1
nixos/tests/paperless-ng.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ lib, ... }: {
enable = true;
passwordFile = builtins.toFile "password" "admin";
};
virtualisation.memorySize = 1024;
};
testScript = ''

1
nixos/tests/plasma5-systemd-start.nix
View File

@ -21,7 +21,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
user = "alice";
};
};
virtualisation.memorySize = 1024;
};
testScript = { nodes, ... }: let

1
nixos/tests/plasma5.nix
View File

@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
user = "alice";
};
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

1
nixos/tests/pleroma.nix
View File

@ -202,7 +202,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
networking.extraHosts = hosts nodes;
networking.firewall.enable = false;
virtualisation.memorySize = 512;
environment.systemPackages = with pkgs; [
provision-db
provision-secrets

1
nixos/tests/privacyidea.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
machine = { ... }: {
virtualisation.cores = 2;
virtualisation.memorySize = 512;
services.privacyidea = {
enable = true;

2
nixos/tests/prometheus-exporters.nix
View File

@ -464,7 +464,6 @@ let
extraFlags = [ "--lnd.network=regtest" ];
};
metricProvider = {
virtualisation.memorySize = 1024;
systemd.services.prometheus-lnd-exporter.serviceConfig.RestartSec = 15;
systemd.services.prometheus-lnd-exporter.after = [ "lnd.service" ];
services.bitcoind.regtest = {
@ -953,7 +952,6 @@ let
};
metricProvider = {
services.rspamd.enable = true;
virtualisation.memorySize = 1024;
};
exporterTest = ''
wait_for_unit("rspamd.service")

1
nixos/tests/prometheus.nix
View File

@ -188,7 +188,6 @@ in import ./make-test-python.nix {
# Minio requires at least 1GiB of free disk space to run.
virtualisation = {
diskSize = 2 * 1024;
memorySize = 1024;
};
networking.firewall.allowedTCPPorts = [ minioPort ];

5
nixos/tests/rspamd.nix
View File

@ -25,7 +25,6 @@ let
machine = {
services.rspamd.enable = true;
networking.enableIPv6 = enableIPv6;
virtualisation.memorySize = 1024;
};
testScript = ''
start_all()
@ -69,7 +68,6 @@ in
group = "rspamd";
}];
};
virtualisation.memorySize = 1024;
};
testScript = ''
@ -118,7 +116,6 @@ in
'';
};
};
virtualisation.memorySize = 1024;
};
testScript = ''
@ -224,7 +221,6 @@ in
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
'';
};
virtualisation.memorySize = 1024;
};
testScript = ''
${initMachine}
@ -291,7 +287,6 @@ in
postfix.enable = true;
workers.rspamd_proxy.type = "rspamd_proxy";
};
virtualisation.memorySize = 1024;
};
testScript = ''
${initMachine}

2
nixos/tests/seafile.nix
View File

@ -1,7 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }:
let
client = { config, pkgs, ... }: {
virtualisation.memorySize = 256;
environment.systemPackages = [ pkgs.seafile-shared pkgs.curl ];
};
in {
@ -12,7 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
nodes = {
server = { config, pkgs, ... }: {
virtualisation.memorySize = 512;
services.seafile = {
enable = true;
ccnetSettings.General.SERVICE_URL = "http://server";

1
nixos/tests/signal-desktop.nix
View File

@ -29,7 +29,6 @@ in {
environment.systemPackages = with pkgs; [
signal-desktop file sqlite sqlcipher-signal
];
virtualisation.memorySize = 1024;
};
enableOCR = true;

1
nixos/tests/spark/default.nix
View File

@ -3,7 +3,6 @@ import ../make-test-python.nix ({...}: {
nodes = {
worker = { nodes, pkgs, ... }: {
virtualisation.memorySize = 1024;
services.spark.worker = {
enable = true;
master = "master:7077";

1
nixos/tests/sway.nix
View File

@ -44,7 +44,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
# To test pinentry via gpg-agent:
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:
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
};

1
nixos/tests/sympa.nix
View File

@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine =
{ ... }:
{
virtualisation.memorySize = 1024;
services.sympa = {
enable = true;

1
nixos/tests/systemd-cryptenroll.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
environment.systemPackages = [ pkgs.cryptsetup ];
virtualisation = {
emptyDiskImages = [ 512 ];
memorySize = 1024;
qemu.options = [
"-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"
"-tpmdev emulator,id=tpm0,chardev=chrtpm"

1
nixos/tests/systemd.nix
View File

@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
imports = [ common/user-account.nix common/x11.nix ];
virtualisation.emptyDiskImages = [ 512 512 ];
virtualisation.memorySize = 1024;
environment.systemPackages = [ pkgs.cryptsetup ];

1
nixos/tests/vault-postgresql.nix
View File

@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
maintainers = [ lnl7 roberth ];
};
machine = { lib, pkgs, ... }: {
virtualisation.memorySize = 512;
environment.systemPackages = [ pkgs.vault ];
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
services.vault.enable = true;

1
nixos/tests/vault.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
environment.systemPackages = [ pkgs.vault ];
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
services.vault.enable = true;
virtualisation.memorySize = 512;
};
testScript =

1
nixos/tests/vaultwarden.nix
View File

@ -140,7 +140,6 @@ let
in
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
virtualisation.memorySize = 768;
}
];

1
nixos/tests/xfce.nix
View File

@ -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
virtualisation.memorySize = 1024;
};
testScript = { nodes, ... }: let