From ae1a0f75831cfcc81d4875031407d2934317300b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 29 Apr 2020 09:11:24 +0200 Subject: tests: install: Increase virtual machine RAM. It seems that 'guix system init' is consuming more than the 800M of RAM currently allocated. Until this is understood, bump the limit to 1.2G. Reported here: https://lists.gnu.org/archive/html/bug-guix/2020-04/msg00519.html * gnu/tests/install.scm (run-install): Bump RAM to 1.2G. --- gnu/tests/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/tests/install.scm') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 713e03194b..3c6f6937ca 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -252,7 +252,7 @@ packages defined in installation-os." (make-marionette `(,(which #$(qemu-command system)) "-no-reboot" - "-m" "800" + "-m" "1200" #$@(cond ((string=? "ext4" installation-disk-image-file-system-type) #~("-drive" -- cgit 1.4.1 From be3abf28af02829cfd99c20ad8f0a86023554394 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 29 Apr 2020 09:24:31 +0200 Subject: tests: install: Fix gui-installed-os test. This is a follow-up of a860eddbbddeae5d3b6fe084e29ac9fafd2d6f02. If using an ISO, the main disk is vda and not vdb anymore. * gnu/tests/install.scm (installation-target-os-for-gui-tests): Use vda2 as swap partition. --- gnu/tests/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/tests/install.scm') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 3c6f6937ca..8650474fbc 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1074,7 +1074,7 @@ build (current-guix) and then store a couple of full system images.") %base-user-accounts)) ;; The installer does not create a swap device in guided mode with ;; encryption support. - (swap-devices (if encrypted? '() '("/dev/vdb2"))) + (swap-devices (if encrypted? '() '("/dev/vda2"))) (services (cons (service dhcp-client-service-type) (operating-system-user-services %minimal-os))))) -- cgit 1.4.1 From c537d2bcb7c652b4776435cd1e2a5119af43dd78 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 29 Apr 2020 15:25:00 +0200 Subject: tests: install: Fix device usage. This is a follow-up of a860eddbbddeae5d3b6fe084e29ac9fafd2d6f02. Guided installation tests are now run from an ISO image. Hence the main block device is vda and not vdb anymore. * gnu/tests/install.scm (installation-target-os-for-gui-tests): Use %minimal-os-on-vda instead of %minimal-os. (%minimal-os-on-vda): Make sure that it replicates the config of %minimal-os. --- gnu/tests/install.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/tests/install.scm') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 8650474fbc..019e21fd39 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -387,6 +387,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.") (services (cons (service marionette-service-type (marionette-configuration (imported-modules '((gnu services herd) + (guix build utils) (guix combinators))))) %base-services)))) @@ -1058,7 +1059,7 @@ build (current-guix) and then store a couple of full system images.") (define* (installation-target-os-for-gui-tests #:key (encrypted? #f)) (operating-system - (inherit %minimal-os) + (inherit %minimal-os-on-vda) (users (append (list (user-account (name "alice") (comment "Bob's sister") @@ -1076,7 +1077,7 @@ build (current-guix) and then store a couple of full system images.") ;; encryption support. (swap-devices (if encrypted? '() '("/dev/vda2"))) (services (cons (service dhcp-client-service-type) - (operating-system-user-services %minimal-os))))) + (operating-system-user-services %minimal-os-on-vda))))) (define* (installation-target-desktop-os-for-gui-tests #:key (encrypted? #f)) -- cgit 1.4.1