From 9cfd889f1d0135d20d3aad13fac5c1a9401c06fd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 8 Apr 2020 12:27:28 +0200
Subject: tests: Mark VM images as non-substitutable.

* gnu/tests/install.scm (run-install): Pass #:substitutable? to
'system-disk-image' and to 'gexp->derivation'.
---
 gnu/tests/install.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/tests/install.scm')

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index b0b40f2764..799a65907b 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -232,7 +232,9 @@ packages defined in installation-os."
                                  os (list target))
                                 #:disk-image-size install-size
                                 #:file-system-type
-                                installation-disk-image-file-system-type)))
+                                installation-disk-image-file-system-type
+                                ;; Don't provide substitutes; too big.
+                                #:substitutable? #f)))
     (define install
       (with-imported-modules '((guix build utils)
                                (gnu build marionette))
@@ -296,7 +298,8 @@ packages defined in installation-os."
               (exit #$(and gui-test
                            (gui-test #~marionette)))))))
 
-    (gexp->derivation "installation" install)))
+    (gexp->derivation "installation" install
+                      #:substitutable? #f)))      ;too big
 
 (define* (qemu-command/writable-image image #:key (memory-size 256))
   "Return as a monadic value the command to run QEMU on a writable copy of
-- 
cgit v1.2.3


From a860eddbbddeae5d3b6fe084e29ac9fafd2d6f02 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 10 Apr 2020 15:46:16 +0200
Subject: tests: Run guided installation tests from an ISO image.

* gnu/tests/install.scm (guided-installation-test): Pass
 #:installation-disk-image-file-system-type to 'run-install'.
---
 gnu/tests/install.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/tests/install.scm')

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 799a65907b..713e03194b 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1125,6 +1125,8 @@ build (current-guix) and then store a couple of full system images.")
                                #:os installation-os-for-gui-tests
                                #:install-size install-size
                                #:target-size target-size
+                               #:installation-disk-image-file-system-type
+                               "iso9660"
                                #:gui-test
                                (lambda (marionette)
                                  (gui-test-program
-- 
cgit v1.2.3