From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54262) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ6iB-0008BC-8T for guix-patches@gnu.org; Mon, 30 Mar 2020 22:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ6i6-0002Tw-UD for guix-patches@gnu.org; Mon, 30 Mar 2020 22:33:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJ6i6-0002Tm-Qh for guix-patches@gnu.org; Mon, 30 Mar 2020 22:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jJ6i6-0006QY-L2 for guix-patches@gnu.org; Mon, 30 Mar 2020 22:33:02 -0400 Subject: [bug#40339] [PATCH] system: tests: Add a Btrfs RAID system test. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:54160) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ6hI-00088n-2m for guix-patches@gnu.org; Mon, 30 Mar 2020 22:32:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ6hG-00023L-Hs for guix-patches@gnu.org; Mon, 30 Mar 2020 22:32:12 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:45788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJ6hG-000231-Bv for guix-patches@gnu.org; Mon, 30 Mar 2020 22:32:10 -0400 Received: by mail-qt1-x82a.google.com with SMTP id t17so17081461qtn.12 for ; Mon, 30 Mar 2020 19:32:10 -0700 (PDT) Received: from hurd (dsl-159-222.b2b2c.ca. [66.158.159.222]) by smtp.gmail.com with ESMTPSA id m65sm12015719qke.109.2020.03.30.19.32.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 19:32:08 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 30 Mar 2020 22:32:07 -0400 Message-ID: <875zelz23c.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40339@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Guix! This adds a system test validating that installing on a Btrfs RAID0 array works (and indeed, it does, without anything new to code -- how refreshing :-)). --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-system-tests-Add-a-Btrfs-RAID-system-test.patch Content-Transfer-Encoding: quoted-printable From=20024ba1459a9cdccffc87106b592dd98568ca1370 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Mar 2020 12:45:10 -0400 Subject: [PATCH] system: tests: Add a Btrfs RAID system test. * gnu/tests/install.scm (%btrfs-raid-root-os) (%btrfs-raid-root-os-source, %btrfs-raid-root-installation-script) (%test-btrfs-raid-root-os): New variables. =2D-- gnu/tests/install.scm | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index b0b40f2764..cf0b14eda0 100644 =2D-- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2020 Mathieu Othacehe +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ %test-raid-root-os %test-encrypted-root-os %test-btrfs-root-os + %test-btrfs-raid-root-os %test-jfs-root-os =20 %test-gui-installed-os @@ -849,6 +851,74 @@ build (current-guix) and then store a couple of full s= ystem images.") (command (qemu-command/writable-image image))) (run-basic-test %btrfs-root-os command "btrfs-root-os"))))) =20 + + +;;; +;;; Btrfs RAID-0 root file system. +;;; +(define-os-with-source (%btrfs-raid-root-os %btrfs-raid-root-os-source) + ;; An OS whose root partition is a RAID partition. + (use-modules (gnu) (gnu tests)) + + (operating-system + (host-name "liberigilo") + (timezone "Europe/Paris") + (locale "en_US.utf8") + + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) + (kernel-arguments '("console=3DttyS0")) + + (file-systems (cons (file-system + (device (file-system-label "root-fs")) + (mount-point "/") + (type "btrfs")) + %base-file-systems)) + (users %base-user-accounts) + (services (cons (service marionette-service-type + (marionette-configuration + (imported-modules '((gnu services herd) + (guix combinators))))) + %base-services)))) + +(define %btrfs-raid-root-installation-script + "\ +. /etc/profile +set -e -x +guix --version + +export GUIX_BUILD_OPTIONS=3D--no-grafts +parted --script /dev/vdb mklabel gpt \\ + mkpart primary ext2 1M 3M \\ + mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 1.4G 2.8G \\ + set 1 boot on \\ + set 1 bios_grub on +mkfs.btrfs -L root-fs -d raid0 -m raid0 /dev/vdb2 /dev/vdb3 +mount /dev/vdb2 /mnt +df -h /mnt +herd start cow-store /mnt +mkdir /mnt/etc +cp /etc/target-config.scm /mnt/etc/config.scm +guix system init /mnt/etc/config.scm /mnt --no-substitutes +sync +reboot\n") + +(define %test-btrfs-raid-root-os + (system-test + (name "btrfs-raid-root-os") + (description "Test functionality of an OS installed with a Btrfs +RAID-0 (stripe) root partition.") + (value + (mlet* %store-monad + ((image (run-install %btrfs-raid-root-os + %btrfs-raid-root-os-source + #:script %btrfs-raid-root-installation-script + #:target-size (* 2800 MiB))) + (command (qemu-command/writable-image image))) + (run-basic-test %btrfs-raid-root-os `(,@command) "btrfs-raid-root-os= "))))) + ;;; ;;; JFS root file system. =2D-=20 2.25.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAl6Cq6cACgkQEmDkZILm NWIe6Q//d/dYpySwuQMToDQljVy16g+jrvyendQKmPzOV2gjAtc/H189NWGAlLxT B4E3u9uVhnXoZadWrRQUcp/cZmT0/sDHRIQNPJ7eIWBjhtJ2RzXrf+x/4x2xgvH4 Fk6CtUYBHnvB2jJeV9nMTDO0k/jCMCv5tdy/6Vq9PwTiPgbcwV0JQ3lJavwjitWN nlNqwv+kFV+bk2jN+FOt0VY1hSaU4jrgQ034VgL5UjloQtx3gsiuaE3d1Qxw3eEf Bg/RYBxYPkvAeVyEvHaqJkeI80DFQCMwGG+Pi1pAtnN5uUePhnz8UJtiqCI4jicN +wD0HYt4WShh6Edl3vUEgF60RDndaaRoIIvK/dNnRSnAKouYebVS0FKj6UW2EWsU 7ccjDHG12QeKXME2dE4CNS2WunNbLGUIo6chEYec9xOgf3Ti/n1iGhqV8QT2ukn9 RgZxYnpIOvYRciB3lkkHQS+Oe9ucRWfTPHqnajtXtch5JxCZiNhschs17XHukiUi VNZzpJ9FLqrFoj5MpUKhSIHlJKWhCOHzWcoJAXw9TxFahljwZpjZujQ2GwY+MmPT womNffvsyG5PXMV3oaZL+93YhE7VBiQUWGFNvDG7rrrrVajDLTRGN85mj/ApGsXE 8RvLukbx+aJ3eH/k82is60S7l6u8gLKfpAGtDVZb5VJyV7xDvYY= =6uwD -----END PGP SIGNATURE----- --==-=-=--