summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2025-10-17 17:18:32 +0300
committerEfraim Flashner <efraim@flashner.co.il>2025-10-17 17:23:20 +0300
commitc787d90fff634e93edaa49c7e8e90dd71668a570 (patch)
treed5b25fcc1ee4d21b2688bf28891be6acf575404a /gnu/tests
parent3141c2c93f74b8221729c4123f152ef933f1887b (diff)
tests: install: Expand the default partition size to 2GiB.
* gnu/tests/install.scm (%simple-installation-script, %extlinux-gpt-installation-script, %simple-installation-script-for-/dev/vda, %separate-store-installation-script, %raid-root-installation-script, %lvm-separate-home-installation-script, %encrypted-home-installation-script, %encrypted-root-not-boot-installation-script, %btrfs-raid-root-installation-script): Enlarge the install partition to 2GiB. (%test-raid-root-os, %test-lvm-separate-home-os, %test-encrypted-root-not-boot-os, %test-btrfs-raid-root-os, %test-gui-uefi-installed-os): Adjust accordingly. Change-Id: Idaf8a9c2a3ccd268b838decf18793c24716154d4
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/install.scm36
1 files changed, 18 insertions, 18 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index cb845c64cc2..dd81a75cbe8 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -170,7 +170,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts
170guix build isc-dhcp 170guix build isc-dhcp
171parted --script /dev/vdb mklabel gpt \\ 171parted --script /dev/vdb mklabel gpt \\
172 mkpart primary ext2 1M 3M \\ 172 mkpart primary ext2 1M 3M \\
173 mkpart primary ext2 3M 1.6G \\ 173 mkpart primary ext2 3M 2G \\
174 set 1 boot on \\ 174 set 1 boot on \\
175 set 1 bios_grub on 175 set 1 bios_grub on
176mkfs.ext4 -L my-root /dev/vdb2 176mkfs.ext4 -L my-root /dev/vdb2
@@ -195,7 +195,7 @@ guix --version
195export GUIX_BUILD_OPTIONS=--no-grafts 195export GUIX_BUILD_OPTIONS=--no-grafts
196guix build isc-dhcp 196guix build isc-dhcp
197parted --script /dev/vdb mklabel gpt \\ 197parted --script /dev/vdb mklabel gpt \\
198 mkpart ext2 1M 1.6G \\ 198 mkpart primary ext2 1M 2G \\
199 set 1 legacy_boot on 199 set 1 legacy_boot on
200mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 200mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1
201mount /dev/vdb1 /mnt 201mount /dev/vdb1 /mnt
@@ -466,7 +466,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts
466guix build isc-dhcp 466guix build isc-dhcp
467parted --script /dev/vda mklabel gpt \\ 467parted --script /dev/vda mklabel gpt \\
468 mkpart primary ext2 1M 3M \\ 468 mkpart primary ext2 1M 3M \\
469 mkpart primary ext2 3M 1.6G \\ 469 mkpart primary ext2 3M 2G \\
470 set 1 boot on \\ 470 set 1 boot on \\
471 set 1 bios_grub on 471 set 1 bios_grub on
472mkfs.ext4 -L my-root /dev/vda2 472mkfs.ext4 -L my-root /dev/vda2
@@ -596,7 +596,7 @@ guix build isc-dhcp
596parted --script /dev/vdb mklabel gpt \\ 596parted --script /dev/vdb mklabel gpt \\
597 mkpart primary ext2 1M 3M \\ 597 mkpart primary ext2 1M 3M \\
598 mkpart primary ext2 3M 400M \\ 598 mkpart primary ext2 3M 400M \\
599 mkpart primary ext2 400M 2.1G \\ 599 mkpart primary ext2 400M 2.4G \\
600 set 1 boot on \\ 600 set 1 boot on \\
601 set 1 bios_grub on 601 set 1 bios_grub on
602mkfs.ext4 -L root-fs /dev/vdb2 602mkfs.ext4 -L root-fs /dev/vdb2
@@ -678,8 +678,8 @@ guix --version
678export GUIX_BUILD_OPTIONS=--no-grafts 678export GUIX_BUILD_OPTIONS=--no-grafts
679parted --script /dev/vdb mklabel gpt \\ 679parted --script /dev/vdb mklabel gpt \\
680 mkpart primary ext2 1M 3M \\ 680 mkpart primary ext2 1M 3M \\
681 mkpart primary ext2 3M 1.6G \\ 681 mkpart primary ext2 3M 2G \\
682 mkpart primary ext2 1.6G 3.2G \\ 682 mkpart primary ext2 2G 4G \\
683 set 1 boot on \\ 683 set 1 boot on \\
684 set 1 bios_grub on 684 set 1 bios_grub on
685yes | mdadm --create /dev/md0 --verbose --level=mirror --raid-devices=2 \\ 685yes | mdadm --create /dev/md0 --verbose --level=mirror --raid-devices=2 \\
@@ -705,7 +705,7 @@ by 'mdadm'.")
705 %raid-root-os-source 705 %raid-root-os-source
706 #:script 706 #:script
707 %raid-root-installation-script 707 %raid-root-installation-script
708 #:target-size (* 3200 MiB))) 708 #:target-size (* 4100 MiB)))
709 (command (qemu-command* images))) 709 (command (qemu-command* images)))
710 (run-basic-test %raid-root-os 710 (run-basic-test %raid-root-os
711 `(,@command) "raid-root-os"))))) 711 `(,@command) "raid-root-os")))))
@@ -959,13 +959,13 @@ guix --version
959export GUIX_BUILD_OPTIONS=--no-grafts 959export GUIX_BUILD_OPTIONS=--no-grafts
960parted --script /dev/vdb mklabel gpt \\ 960parted --script /dev/vdb mklabel gpt \\
961 mkpart primary ext2 1M 3M \\ 961 mkpart primary ext2 1M 3M \\
962 mkpart primary ext2 3M 1.6G \\ 962 mkpart primary ext2 3M 2G \\
963 mkpart primary 1.6G 3.2G \\ 963 mkpart primary ext2 2G 4G \\
964 set 1 boot on \\ 964 set 1 boot on \\
965 set 1 bios_grub on 965 set 1 bios_grub on
966pvcreate /dev/vdb3 966pvcreate /dev/vdb3
967vgcreate vg0 /dev/vdb3 967vgcreate vg0 /dev/vdb3
968lvcreate -L 1.6G -n home vg0 968lvcreate -L 2G -n home vg0
969vgchange -ay 969vgchange -ay
970mkfs.ext4 -L root-fs /dev/vdb2 970mkfs.ext4 -L root-fs /dev/vdb2
971mkfs.ext4 /dev/mapper/vg0-home 971mkfs.ext4 /dev/mapper/vg0-home
@@ -991,7 +991,7 @@ reboot\n")
991 #:script 991 #:script
992 %lvm-separate-home-installation-script 992 %lvm-separate-home-installation-script
993 #:packages (list lvm2-static) 993 #:packages (list lvm2-static)
994 #:target-size (* 3200 MiB))) 994 #:target-size (* 4100 MiB)))
995 (command (qemu-command* images))) 995 (command (qemu-command* images)))
996 (run-basic-test %lvm-separate-home-os 996 (run-basic-test %lvm-separate-home-os
997 `(,@command) "lvm-separate-home-os"))))) 997 `(,@command) "lvm-separate-home-os")))))
@@ -1047,7 +1047,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts
1047parted --script /dev/vdb mklabel gpt \\ 1047parted --script /dev/vdb mklabel gpt \\
1048 mkpart primary ext2 1M 3M \\ 1048 mkpart primary ext2 1M 3M \\
1049 mkpart primary ext2 3M 2G \\ 1049 mkpart primary ext2 3M 2G \\
1050 mkpart primary 2G 2.4G \\ 1050 mkpart primary ext2 2G 2.4G \\
1051 set 1 boot on \\ 1051 set 1 boot on \\
1052 set 1 bios_grub on 1052 set 1 bios_grub on
1053 1053
@@ -1238,7 +1238,7 @@ ls -l /run/current-system/gc-roots
1238parted --script /dev/vdb mklabel gpt \\ 1238parted --script /dev/vdb mklabel gpt \\
1239 mkpart primary ext2 1M 3M \\ 1239 mkpart primary ext2 1M 3M \\
1240 mkpart primary ext2 3M 50M \\ 1240 mkpart primary ext2 3M 50M \\
1241 mkpart primary ext2 50M 1.6G \\ 1241 mkpart primary ext2 50M 2G \\
1242 set 1 boot on \\ 1242 set 1 boot on \\
1243 set 1 bios_grub on 1243 set 1 bios_grub on
1244echo -n \"~a\" | cryptsetup luksFormat -i 1 --uuid=\"~a\" -q /dev/vdb3 - 1244echo -n \"~a\" | cryptsetup luksFormat -i 1 --uuid=\"~a\" -q /dev/vdb3 -
@@ -1278,7 +1278,7 @@ store a couple of full system images.")
1278 #:script 1278 #:script
1279 %encrypted-root-not-boot-installation-script 1279 %encrypted-root-not-boot-installation-script
1280 #:target-size 1280 #:target-size
1281 (* 1600 MiB))) 1281 (* 2100 MiB)))
1282 (command (qemu-command* images))) 1282 (command (qemu-command* images)))
1283 (run-basic-test %encrypted-root-not-boot-os command 1283 (run-basic-test %encrypted-root-not-boot-os command
1284 "encrypted-root-not-boot-os" 1284 "encrypted-root-not-boot-os"
@@ -1398,8 +1398,8 @@ guix --version
1398export GUIX_BUILD_OPTIONS=--no-grafts 1398export GUIX_BUILD_OPTIONS=--no-grafts
1399parted --script /dev/vdb mklabel gpt \\ 1399parted --script /dev/vdb mklabel gpt \\
1400 mkpart primary ext2 1M 3M \\ 1400 mkpart primary ext2 1M 3M \\
1401 mkpart primary ext2 3M 1.4G \\ 1401 mkpart primary ext2 3M 2G \\
1402 mkpart primary ext2 1.4G 2.8G \\ 1402 mkpart primary ext2 2G 4G \\
1403 set 1 boot on \\ 1403 set 1 boot on \\
1404 set 1 bios_grub on 1404 set 1 bios_grub on
1405mkfs.btrfs -L root-fs -d raid0 -m raid0 /dev/vdb2 /dev/vdb3 1405mkfs.btrfs -L root-fs -d raid0 -m raid0 /dev/vdb2 /dev/vdb3
@@ -1422,7 +1422,7 @@ RAID-0 (stripe) root partition.")
1422 ((images (run-install %btrfs-raid-root-os 1422 ((images (run-install %btrfs-raid-root-os
1423 %btrfs-raid-root-os-source 1423 %btrfs-raid-root-os-source
1424 #:script %btrfs-raid-root-installation-script 1424 #:script %btrfs-raid-root-installation-script
1425 #:target-size (* 2800 MiB))) 1425 #:target-size (* 4100 MiB)))
1426 (command (qemu-command* images))) 1426 (command (qemu-command* images)))
1427 (run-basic-test %btrfs-raid-root-os `(,@command) "btrfs-raid-root-os"))))) 1427 (run-basic-test %btrfs-raid-root-os `(,@command) "btrfs-raid-root-os")))))
1428 1428
@@ -2127,7 +2127,7 @@ build (current-guix) and then store a couple of full system images.")
2127 #:uefi-support? #t 2127 #:uefi-support? #t
2128 #:target-os (installation-target-os-for-gui-tests 2128 #:target-os (installation-target-os-for-gui-tests
2129 #:uefi-support? #t) 2129 #:uefi-support? #t)
2130 #:target-size (* 3200 MiB))) 2130 #:target-size (* 4100 MiB)))
2131 2131
2132(define %test-gui-installed-os-encrypted 2132(define %test-gui-installed-os-encrypted
2133 (guided-installation-test 2133 (guided-installation-test