From unknown Sat Aug 16 22:00:07 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#54368 <54368@debbugs.gnu.org> To: bug#54368 <54368@debbugs.gnu.org> Subject: Status: [PATCH 0/4] Add Btrfs RAID10 install tests. Reply-To: bug#54368 <54368@debbugs.gnu.org> Date: Sun, 17 Aug 2025 05:00:07 +0000 retitle 54368 [PATCH 0/4] Add Btrfs RAID10 install tests. reassign 54368 guix-patches submitter 54368 Maxim Cournoyer severity 54368 normal tag 54368 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 13 00:41:26 2022 Received: (at submit) by debbugs.gnu.org; 13 Mar 2022 05:41:26 +0000 Received: from localhost ([127.0.0.1]:41395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTGys-0007lH-0J for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:41:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:60508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTGyp-0007l9-WE for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:41:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTGyo-0004sP-PL for guix-patches@gnu.org; Sun, 13 Mar 2022 00:41:23 -0500 Received: from [2607:f8b0:4864:20::72f] (port=40694 helo=mail-qk1-x72f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTGyl-0007A0-65 for guix-patches@gnu.org; Sun, 13 Mar 2022 00:41:21 -0500 Received: by mail-qk1-x72f.google.com with SMTP id c7so10321802qka.7 for ; Sat, 12 Mar 2022 21:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0Xg6MvcPETXwzIsSadfGk/6OOW+5/HOVX46g3CDf1i4=; b=L+eK7W+TCJW+WHCgypIrjbvsIx/LDE2ny3GPQ3hZXE4+WrX08/im7uzOsB/ep/GiVt DoNHQaAU0kO6Mm+X70CTLIAMJhgMYgMPOBUPYnrv8ozNvbXVU/SZCu5q+ixk7CHbcdyt Ja2SndyloVaGoMIfTZAienqGgryl018WyXGD2eXzTZ9xTL8g4+McDDC0iNT/24N0Ovjg PP6ZPJbe4EPeoaNRDbHtOAqXKjPSGsGEvOacyucXWrS+5QxYj6JyuU1c0735JDVD5Bzb b3lmIJCICsulY15JZsAxZxIrX3YiqRP+3TR+JQo942HX3rGOSvxWdnFef/AFAO9l040B N8PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0Xg6MvcPETXwzIsSadfGk/6OOW+5/HOVX46g3CDf1i4=; b=K0//NlbhSGqceqQevSmeX/nDDnFfqApZysnNsVK8X1Nl/LCt3cZhBmTaGV24/fwGas SpepFBacAeb+2/CyF+EodjEDtAGO4DEOAWiwOPH9/BTVI7EuR8Uk0YbBCFMz7mViDRbz 1zvWUpUBQwdrYoAyVnzpE26wx+zCEoWT76wGY9JsUOUJchPUEsR9k/VwHq9c2cE1zgB9 YWUpmYt5GteJOeczyCSsWum78jBbwd3ZKUkzeEYXARZIj69tmjQ6BmQkJqqVdT3MfbvV /xCASNXN6Ts/u9pBu2Bm1KkjqNpe4daiuS+qUFMnODNyMuX2QsZ/ulrtpS30tFpMzedK tK5g== X-Gm-Message-State: AOAM532JyP7+zAkRxvoQ5otuag7RMPmfIXZt53aAIl6Ikhhox9EWi8MN zxjiMKIer1nxgaCMl+RkgyFPn4oX67g= X-Google-Smtp-Source: ABdhPJzT8vNDvT57y/yoez8VVa/eVvn2CBJY1hPPt2yOev7cuGhSORbY0sW1ADdzb42f95CotvJ7vg== X-Received: by 2002:a05:620a:4156:b0:67d:6a0d:2a3e with SMTP id k22-20020a05620a415600b0067d6a0d2a3emr8837540qko.462.1647150077354; Sat, 12 Mar 2022 21:41:17 -0800 (PST) Received: from localhost.localdomain (dsl-153-119.b2b2c.ca. [66.158.153.119]) by smtp.gmail.com with ESMTPSA id x12-20020a05620a12ac00b0067d4bfffc59sm5109475qki.118.2022.03.12.21.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 21:41:16 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/4] Add Btrfs RAID10 install tests. Date: Sun, 13 Mar 2022 00:40:40 -0500 Message-Id: <20220313054040.17120-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::72f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello Guix! On the quest to get our Berlin CI machine rebooted on a Btrfs RAID10 array, these new system tests validate that software-wise, it's supposed to work. Thanks, Maxim Cournoyer (4): tests: install: Adjust the timeouts on two failing tests. tests: install: Streamline 'qemu-command/writable-image'. tests: install: Enable the use of multiple disk devices for tests. tests: install: Add two new Btrfs RAID10 install test. gnu/tests/base.scm | 6 +- gnu/tests/install.scm | 382 +++++++++++++++++++++++++++--------------- 2 files changed, 254 insertions(+), 134 deletions(-) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 13 00:44:47 2022 Received: (at 54368) by debbugs.gnu.org; 13 Mar 2022 05:44:47 +0000 Received: from localhost ([127.0.0.1]:41406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH27-0007qf-17 for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:47 -0500 Received: from mail-qk1-f171.google.com ([209.85.222.171]:43720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH25-0007qS-De for 54368@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:45 -0500 Received: by mail-qk1-f171.google.com with SMTP id z66so10328895qke.10 for <54368@debbugs.gnu.org>; Sat, 12 Mar 2022 21:44:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+LxsIodeBWPg6dC0Tdb9IO8JJUbOHqfk2cS0I+DUJ4w=; b=Ijq3/fkhQlOgDm1ONlM6D+jcz+36rIFjHWETwu0k4XPVt8QNIAcxVH602IB+Kxh9qI dBGssxMHPqaeFcVoL8yTaqxZtPkUpTEH3AGzCgGzX284Of4HkUQymT83SvtonfiTEBKK TwKDetTbtJ95RgmHbCfKw/Lb3xctXxioDMu8/2ec2ovn/ofx8OX5GoACfej1nNL3kaF1 aKpWo5ZLpsiUSqmBeMA6k/Etr//Z2r3k2y47ydGhGVAVKBDVdhRy9KtJDTfNHWIDHipe lQ2VEfapp7pLnIbjqPyiE/6AA1tUx5Z8Rwrgfc/ff9wUAx3fr6zkYUeDBAvD6jKmwH24 Z8GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+LxsIodeBWPg6dC0Tdb9IO8JJUbOHqfk2cS0I+DUJ4w=; b=JzeO3D0YHOqJSx+qfzKWBHMitk/cP8OxLWTpKzNOQQJHzAEytVCtrB3VzecM5hQabd XYAQL5erWr2KjKNqGp2k+Fw2XKt8h0rSY3P9gX0tRPSOnStR3kjSvOYXN+cJk2pV5iBN coH2EKW1J3emZnOZc3BQleX6XbCDITbcQubNUWCAcD9eYZWDOYAsErLEgZN+9JhQ1xhe VUQFxO9cp+GWde705ZaLLS5HEpU2nk7CaB4ae1YQATaDhuC5WApIEugoaDW/RA/3ujM/ gcGkobhFIq0OKscQI3jBEWrzfD+IweWB4ona1i6oXS3z+/hASlb12KbE6AbyUPCPfn28 yIpw== X-Gm-Message-State: AOAM53355Y15Om3ADcMoVdKGgXJK0yqHjk7sveC4MdI2ATeKky5FBvVS V5YTPWVEBog7KlhgE1g/ODBOhjZ0zLw= X-Google-Smtp-Source: ABdhPJwOA3a67/SByHu5CQhnyx4wBCf2+B/CR6fdp/nSk3JC4Koz09BrnDJsfR8LKeNoGicH9QoVPw== X-Received: by 2002:a05:620a:27c8:b0:67d:2a41:d15d with SMTP id i8-20020a05620a27c800b0067d2a41d15dmr11147731qkp.703.1647150279633; Sat, 12 Mar 2022 21:44:39 -0800 (PST) Received: from localhost.localdomain (dsl-153-119.b2b2c.ca. [66.158.153.119]) by smtp.gmail.com with ESMTPSA id v129-20020a379387000000b0064936bab2fcsm6376657qkd.48.2022.03.12.21.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 21:44:39 -0800 (PST) From: Maxim Cournoyer To: 54368@debbugs.gnu.org Subject: [PATCH 1/4] tests: install: Adjust the timeouts on two failing tests. Date: Sun, 13 Mar 2022 00:43:52 -0500 Message-Id: <20220313054356.17578-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The 'login on tty1' and 'getlogin on tty1' tests were failing on a machine equipped with slower hard drives. * gnu/tests/base.scm (run-basic-test) ["login on tty1", "getlogin on tty1"]: Bump timeout from 10 to 30 s. --- gnu/tests/base.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 38d4317e52..cfaa736aec 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -346,7 +346,8 @@ (define (user-owned? file) ;; It can take a while before the shell commands are executed. (marionette-eval '(use-modules (rnrs io ports)) marionette) (wait-for-file "/root/logged-in" marionette - #:read 'get-string-all))) + #:read 'get-string-all + #:timeout 30))) (test-equal "getlogin on tty1" "\"root\"" @@ -360,7 +361,8 @@ (define (user-owned? file) ;; It can take a while before the shell commands are executed. (marionette-eval '(use-modules (rnrs io ports)) marionette) (wait-for-file "/root/login-id" marionette - #:read 'get-string-all))) + #:read 'get-string-all + #:timeout 30))) ;; There should be one utmpx entry for the user logged in on tty1. (test-equal "utmpx entry" -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 13 00:44:52 2022 Received: (at 54368) by debbugs.gnu.org; 13 Mar 2022 05:44:52 +0000 Received: from localhost ([127.0.0.1]:41409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2C-0007r1-8D for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:52 -0500 Received: from mail-qk1-f181.google.com ([209.85.222.181]:34772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2A-0007qY-Dh for 54368@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:50 -0500 Received: by mail-qk1-f181.google.com with SMTP id 1so9738762qke.1 for <54368@debbugs.gnu.org>; Sat, 12 Mar 2022 21:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jxzUKyzPB6YDczelGkxCT4nUeEucVvKs1dGfgMu6LNo=; b=qy93ONtJrhV/OEuKQwS5k9ywmlYaMc72JJFf54pisE2GbSWIXBNcwEZbVa47eBjZCt MxfDICciCbRUi9yE8qaY896zMW30j18WWcDIDdSsihxxehPRqHSPwZg3P9/JufcxNBib rqehy3FhJIIQWmcYmOZ1NHeQsN9jHHxcaxzeX9vtin/qT1bh8lL3Mo9OvKJTGTXb1Ahl Lx5i4egXEg5ny1cfDHzFOlA9BiL0mHFPTEES92hLlbUtUzS57HFqGaRvaUW6OCkGrnAG qEZE64Sbx9VSBGPP4USa+i+WB/0diaVs4fTYk2SLJIrIivo4OuDJbDoSIvstJpNlsrM9 +EDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jxzUKyzPB6YDczelGkxCT4nUeEucVvKs1dGfgMu6LNo=; b=ywS1oh8zoETXMmUM5nnz/nLV4wVuOnlHc79D3yMCTlNKJWS1TmhjuBaB/ndMnFlmMa Y5tGQBATWPBidf3BD8zbtGc4xu2dv/3tbm0DeH64H+b+HXKnsOLTKuwD1o6rPdpnqhru JBc7VsLw2DTdJbu9b4AKYmi6CsT2uz00mbG1t4Gp6RxvpmBpSo2THINtIlAVOOhJyH3w DWXtmIGDeK+SIfxhDbJuGjw23SPI8ZTG6Bea9b1Y+vFTJskG8Va0/thryszwi/RtycRI IrzbfS9EQiyu4eZj515C7oPZdXW2+ALAXRLde7+TTr0tGPQ8Awk7Tu+gOMjk+nP8qFQy MaHw== X-Gm-Message-State: AOAM5326EDbVcS85EgzLl2ytfehPz40yfnUWV25s3o3R/j//eZtlmVYX KL8T/Bjco5ET9S9tFgk2RlJam5c68Lg= X-Google-Smtp-Source: ABdhPJwUFbe1OZkyE5Mgttbdv4OkieHHr/van4DgpSGCwk7oQz4AGhSVa/0ZoA5Zv/V3ciz+wH5JNg== X-Received: by 2002:a37:bac6:0:b0:663:5fde:226f with SMTP id k189-20020a37bac6000000b006635fde226fmr11318697qkf.137.1647150284699; Sat, 12 Mar 2022 21:44:44 -0800 (PST) Received: from localhost.localdomain (dsl-153-119.b2b2c.ca. [66.158.153.119]) by smtp.gmail.com with ESMTPSA id v129-20020a379387000000b0064936bab2fcsm6376657qkd.48.2022.03.12.21.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 21:44:44 -0800 (PST) From: Maxim Cournoyer To: 54368@debbugs.gnu.org Subject: [PATCH 2/4] tests: install: Streamline 'qemu-command/writable-image'. Date: Sun, 13 Mar 2022 00:43:53 -0500 Message-Id: <20220313054356.17578-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220313054356.17578-1-maxim.cournoyer@gmail.com> References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/tests/install.scm (qemu-command/writable-image): Replace the use of a writable backing file by the use of the '-snapshot' option, and rename to... (qemu-command*): ... this, adjusting all calls. --- gnu/tests/install.scm | 61 +++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index ae8c6051f1..d1f8cc1c6d 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -341,29 +341,16 @@ (define marionette (gexp->derivation "installation" install #:substitutable? #f))) ;too big -(define* (qemu-command/writable-image image - #:key - (uefi-support? #f) - (memory-size 256)) - "Return as a monadic value the command to run QEMU on a writable copy of -IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." +(define* (qemu-command* image #:key (uefi-support? #f) (memory-size 256)) + "Return as a monadic value the command to run QEMU with a writable overlay +above IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." (mlet* %store-monad ((system (current-system)) (uefi-firmware -> (and uefi-support? (uefi-firmware system)))) - (return #~(let ((image #$image)) - ;; First we need a writable copy of the image. - (format #t "creating writable image from '~a'...~%" image) - (unless (zero? (system* #+(file-append qemu-minimal - "/bin/qemu-img") - "create" "-f" "qcow2" "-F" "qcow2" - "-o" - (string-append "backing_file=" image) - "disk.img")) - (error "failed to create writable QEMU image" image)) - - (chmod "disk.img" #o644) + (return #~(begin `(,(string-append #$qemu-minimal "/bin/" #$(qemu-command system)) + "-snapshot" ;for the volatile, writable overlay ,@(if (file-exists? "/dev/kvm") '("-enable-kvm") '()) @@ -371,7 +358,7 @@ (define* (qemu-command/writable-image image '("-bios" #$uefi-firmware) '()) "-no-reboot" "-m" #$(number->string memory-size) - "-drive" "file=disk.img,if=virtio"))))) + "-drive" (format #f "file=~a,if=virtio" #$image)))))) (define %test-installed-os (system-test @@ -382,7 +369,7 @@ (define %test-installed-os build (current-guix) and then store a couple of full system images.") (value (mlet* %store-monad ((image (run-install %minimal-os %minimal-os-source)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %minimal-os command "installed-os"))))) @@ -399,7 +386,7 @@ (define %test-installed-extlinux-os (list syslinux) #:script %extlinux-gpt-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %minimal-extlinux-os command "installed-extlinux-os"))))) @@ -476,7 +463,7 @@ (define %test-iso-image-installer %simple-installation-script-for-/dev/vda #:installation-image-type 'uncompressed-iso9660)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %minimal-os-on-vda command name))))) @@ -531,7 +518,7 @@ (define %test-separate-home-os %separate-home-os-source #:script %simple-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %separate-home-os command "separate-home-os"))))) @@ -608,7 +595,7 @@ (define %test-separate-store-os %separate-store-os-source #:script %separate-store-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %separate-store-os command "separate-store-os"))))) @@ -690,7 +677,7 @@ (define %test-raid-root-os #:script %raid-root-installation-script #:target-size (* 3200 MiB))) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %raid-root-os `(,@command) "raid-root-os"))))) @@ -823,7 +810,7 @@ (define %test-encrypted-root-os %encrypted-root-os-source #:script %encrypted-root-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %encrypted-root-os command "encrypted-root-os" #:initialization enter-luks-passphrase))))) @@ -909,7 +896,7 @@ (define %test-lvm-separate-home-os %lvm-separate-home-installation-script #:packages (list lvm2-static) #:target-size (* 3200 MiB))) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %lvm-separate-home-os `(,@command) "lvm-separate-home-os"))))) @@ -1009,7 +996,7 @@ (define %test-encrypted-root-not-boot-os %encrypted-root-not-boot-os-source #:script %encrypted-root-not-boot-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %encrypted-root-not-boot-os command "encrypted-root-not-boot-os" #:initialization enter-luks-passphrase))))) @@ -1085,7 +1072,7 @@ (define %test-btrfs-root-os %btrfs-root-os-source #:script %btrfs-root-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %btrfs-root-os command "btrfs-root-os"))))) @@ -1153,7 +1140,7 @@ (define %test-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))) + (command (qemu-command* image))) (run-basic-test %btrfs-raid-root-os `(,@command) "btrfs-raid-root-os"))))) @@ -1245,7 +1232,7 @@ (define %test-btrfs-root-on-subvolume-os %btrfs-root-on-subvolume-os-source #:script %btrfs-root-on-subvolume-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %btrfs-root-on-subvolume-os command "btrfs-root-on-subvolume-os"))))) @@ -1319,7 +1306,7 @@ (define %test-jfs-root-os %jfs-root-os-source #:script %jfs-root-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %jfs-root-os command "jfs-root-os"))))) @@ -1392,7 +1379,7 @@ (define %test-f2fs-root-os %f2fs-root-os-source #:script %f2fs-root-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %f2fs-root-os command "f2fs-root-os"))))) @@ -1465,7 +1452,7 @@ (define %test-xfs-root-os %xfs-root-os-source #:script %xfs-root-installation-script)) - (command (qemu-command/writable-image image))) + (command (qemu-command* image))) (run-basic-test %xfs-root-os command "xfs-root-os"))))) @@ -1748,9 +1735,9 @@ (define* (guided-installation-test name #:desktop? desktop? #:encrypted? encrypted? #:uefi-support? uefi-support?)))) - (command (qemu-command/writable-image image - #:uefi-support? uefi-support? - #:memory-size 512))) + (command (qemu-command* image + #:uefi-support? uefi-support? + #:memory-size 512))) (run-basic-test target-os command name #:initialization (and encrypted? enter-luks-passphrase) #:root-password %root-password -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 13 00:44:57 2022 Received: (at 54368) by debbugs.gnu.org; 13 Mar 2022 05:44:57 +0000 Received: from localhost ([127.0.0.1]:41413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2G-0007rM-PF for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:57 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:37779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2D-0007qo-Se for 54368@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:54 -0500 Received: by mail-qt1-f182.google.com with SMTP id n11so5111677qtk.4 for <54368@debbugs.gnu.org>; Sat, 12 Mar 2022 21:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1AdbyJSP/ZHSXrZCiAF8sT1AIBAB5ej5/xbmqRVMjpk=; b=Na9ZyeEijMGTPlrtAQyTME4nfzk3l4xHT2ubFMNDOPFJXCRH3MkUSLQ/tADQ8OnBg0 2bFoJNrMIewkIDa38qosuYo9fWCXa+ol7D88puktrih2fe6+cKxMtZztgmX/fs7Wsaiu 7z/dB5tdyFmsofxiqp56g01G4k93t0bwzPlQViirPNRzwEyPdM+TlFzYZOlbNN0KnKlH ZLQzrmXGc50PtUsoqNilh1zK5L9/V3pezqkjUXkKtESloJLvCDJI6I9m7o9nDOBPJla/ o0FL5y1rVvQoAbSqEsc7bn3EQ+l1AErWduUIwjP2ekRJ5FoNo1MOskkGp7ddYrYVzK09 W01g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1AdbyJSP/ZHSXrZCiAF8sT1AIBAB5ej5/xbmqRVMjpk=; b=x8eoqc5tyQCMktTnYiqzAsDvTF+Cao92n0k9ooQm1y6K8XL8iSbJwTXZjklBHEex0p vAUMW/XsyokUZruqYCbfHdR/NlJE4hF/XvLiYJwWttnp+WOsdIT68oJ7rhNizhRQIsu4 mG++5z9vMGw+8lI4IkGBwsoBpyOxf/NDznycjal3b01I5sF90AsLOG81oBIWsh42oak5 GcynSZcjH5RuUx+rt9trswGdqBPwHMCjp1hgI1c8T9m+tjRfkKEoB96iIMbkvO9J+4Xk vOFGE3RfPnENLHDLeeMRIIwF/r/xO4NyAXJ8EjNNKtLL/YGHGwJyK6lO2/xX3ugew1fG sCUg== X-Gm-Message-State: AOAM5328WahTrSKBxyxXAb5GXUgP/kar2LQGlmbuCBH08xy+2sM7845G jR6rIDQTDCIB1jfJ/vgqAj8MBFIIIzU= X-Google-Smtp-Source: ABdhPJygNR6rJbtRvTFyKzm8eNT8pmoOqMJxc12BhIEADSPsFj6fHpm/4NjdHfUgrrYCcGyDWrXZYA== X-Received: by 2002:a05:622a:4cb:b0:2e1:ce8c:f097 with SMTP id q11-20020a05622a04cb00b002e1ce8cf097mr613504qtx.395.1647150287747; Sat, 12 Mar 2022 21:44:47 -0800 (PST) Received: from localhost.localdomain (dsl-153-119.b2b2c.ca. [66.158.153.119]) by smtp.gmail.com with ESMTPSA id v129-20020a379387000000b0064936bab2fcsm6376657qkd.48.2022.03.12.21.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 21:44:47 -0800 (PST) From: Maxim Cournoyer To: 54368@debbugs.gnu.org Subject: [PATCH 3/4] tests: install: Enable the use of multiple disk devices for tests. Date: Sun, 13 Mar 2022 00:43:54 -0500 Message-Id: <20220313054356.17578-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220313054356.17578-1-maxim.cournoyer@gmail.com> References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/tests/install.scm (run-install)[NUMBER-OF-DISKS]: Add argument, update doc and adjust. The returned gexp output is now a list of images rather than the image itself. * gnu/tests/install.scm (qemu-command*): Rename IMAGE argument to IMAGES, to account for the above change. Adjust doc. Generate a QEMU '-drive' argument for each disk image. (%test-installed-os): Rename the IMAGE variable to IMAGES. (%test-installed-extlinux-os): Likewise. (%test-iso-image-installer): Likewise. (%test-separate-home-os): Likewise. (%test-separate-store-os): Likewise. (%test-raid-root-os): Likewise. (%test-encrypted-root-os): Likewise. (%test-lvm-separate-home-os): Likewise. (%test-encrypted-root-not-boot-os): Likewise. (%test-btrfs-root-os): Likewise. (%test-btrfs-raid-root-os): Likewise. (%test-btrfs-root-on-subvolume-os): Likewise. (%test-jfs-root-os): Likewise. (%test-f2fs-root-os): Likewise. (%test-xfs-root-os): Likewise. (guided-installation-test): Likewise. --- gnu/tests/install.scm | 244 +++++++++++++++++++++++------------------- 1 file changed, 132 insertions(+), 112 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index d1f8cc1c6d..59e76c86e7 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -240,12 +240,14 @@ (define* (run-install target-os target-os-source (uefi-support? #f) (installation-image-type 'efi-raw) (install-size 'guess) - (target-size (* 2200 MiB))) + (target-size (* 2200 MiB)) + (number-of-disks 1)) "Run SCRIPT (a shell script following the system installation procedure) in -OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing -the installed system. The packages specified in PACKAGES will be appended to -packages defined in installation-os." - +OS to install TARGET-OS. Return the VM disk images of TARGET-SIZE bytes +containing the installed system. Unless providing OS, the PACKAGES will be +added to the packages defined in INSTALLATION-OS (from (gnu system install)). +NUMBER-OF-DISKS can be used to specify a number of disks different than one, +such as for RAID systems." (mlet* %store-monad ((_ (set-grafting #f)) (system (current-system)) @@ -276,13 +278,18 @@ (define install (gnu build marionette)) #~(begin (use-modules (guix build utils) - (gnu build marionette)) + (gnu build marionette) + (srfi srfi-1)) (set-path-environment-variable "PATH" '("bin") (list #$qemu-minimal)) - (system* "qemu-img" "create" "-f" "qcow2" - #$output #$(number->string target-size)) + (mkdir-p #$output) + (for-each (lambda (n) + (system* "qemu-img" "create" "-f" "qcow2" + (format #f "~a/disk~a.qcow2" #$output n) + #$(number->string target-size))) + (iota #$number-of-disks)) (define marionette (make-marionette @@ -303,8 +310,12 @@ (define marionette (error "unsupported installation-image-type:" installation-image-type))) - "-drive" - ,(string-append "file=" #$output ",if=virtio") + ,@(append-map + (lambda (n) + (list "-drive" + (format #f "file=~a/disk~a.qcow2,if=virtio" + #$output n))) + (iota #$number-of-disks)) ,@(if (file-exists? "/dev/kvm") '("-enable-kvm") '())))) @@ -338,16 +349,23 @@ (define marionette (exit #$(and gui-test (gui-test #~marionette))))))) - (gexp->derivation "installation" install - #:substitutable? #f))) ;too big + (mlet %store-monad ((images-dir (gexp->derivation "installation" + install + #:substitutable? #f))) ;too big + (return (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (find-files #$images-dir))))))) -(define* (qemu-command* image #:key (uefi-support? #f) (memory-size 256)) +(define* (qemu-command* images #:key (uefi-support? #f) (memory-size 256)) "Return as a monadic value the command to run QEMU with a writable overlay -above IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." +on top of IMAGES, a list disk images. The QEMU VM has access to MEMORY-SIZE +MiB of RAM." (mlet* %store-monad ((system (current-system)) (uefi-firmware -> (and uefi-support? (uefi-firmware system)))) (return #~(begin + (use-modules (srfi srfi-1)) `(,(string-append #$qemu-minimal "/bin/" #$(qemu-command system)) "-snapshot" ;for the volatile, writable overlay @@ -358,7 +376,10 @@ (define* (qemu-command* image #:key (uefi-support? #f) (memory-size 256)) '("-bios" #$uefi-firmware) '()) "-no-reboot" "-m" #$(number->string memory-size) - "-drive" (format #f "file=~a,if=virtio" #$image)))))) + ,@(append-map (lambda (image) + (list "-drive" (format #f "file=~a,if=virtio" + image))) + #$images)))))) (define %test-installed-os (system-test @@ -368,8 +389,8 @@ (define %test-installed-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %minimal-os %minimal-os-source)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %minimal-os %minimal-os-source)) + (command (qemu-command* images))) (run-basic-test %minimal-os command "installed-os"))))) @@ -380,13 +401,13 @@ (define %test-installed-extlinux-os "Test basic functionality of an OS booted with an extlinux bootloader. As per %test-installed-os, this test is expensive in terms of CPU and storage.") (value - (mlet* %store-monad ((image (run-install %minimal-extlinux-os - %minimal-extlinux-os-source - #:packages - (list syslinux) - #:script - %extlinux-gpt-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %minimal-extlinux-os + %minimal-extlinux-os-source + #:packages + (list syslinux) + #:script + %extlinux-gpt-installation-script)) + (command (qemu-command* images))) (run-basic-test %minimal-extlinux-os command "installed-extlinux-os"))))) @@ -456,14 +477,14 @@ (define %test-iso-image-installer (description "") (value - (mlet* %store-monad ((image (run-install - %minimal-os-on-vda - %minimal-os-on-vda-source - #:script - %simple-installation-script-for-/dev/vda - #:installation-image-type - 'uncompressed-iso9660)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install + %minimal-os-on-vda + %minimal-os-on-vda-source + #:script + %simple-installation-script-for-/dev/vda + #:installation-image-type + 'uncompressed-iso9660)) + (command (qemu-command* images))) (run-basic-test %minimal-os-on-vda command name))))) @@ -514,11 +535,11 @@ (define %test-separate-home-os partition. In particular, home directories must be correctly created (see ).") (value - (mlet* %store-monad ((image (run-install %separate-home-os - %separate-home-os-source - #:script - %simple-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %separate-home-os + %separate-home-os-source + #:script + %simple-installation-script)) + (command (qemu-command* images))) (run-basic-test %separate-home-os command "separate-home-os"))))) @@ -591,11 +612,11 @@ (define %test-separate-store-os "Test basic functionality of an OS installed like one would do by hand, where /gnu lives on a separate partition.") (value - (mlet* %store-monad ((image (run-install %separate-store-os - %separate-store-os-source - #:script - %separate-store-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %separate-store-os + %separate-store-os-source + #:script + %separate-store-installation-script)) + (command (qemu-command* images))) (run-basic-test %separate-store-os command "separate-store-os"))))) @@ -672,12 +693,12 @@ (define %test-raid-root-os "Test functionality of an OS installed with a RAID root partition managed by 'mdadm'.") (value - (mlet* %store-monad ((image (run-install %raid-root-os - %raid-root-os-source - #:script - %raid-root-installation-script - #:target-size (* 3200 MiB))) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %raid-root-os + %raid-root-os-source + #:script + %raid-root-installation-script + #:target-size (* 3200 MiB))) + (command (qemu-command* images))) (run-basic-test %raid-root-os `(,@command) "raid-root-os"))))) @@ -806,11 +827,11 @@ (define %test-encrypted-root-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %encrypted-root-os - %encrypted-root-os-source - #:script - %encrypted-root-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %encrypted-root-os + %encrypted-root-os-source + #:script + %encrypted-root-installation-script)) + (command (qemu-command* images))) (run-basic-test %encrypted-root-os command "encrypted-root-os" #:initialization enter-luks-passphrase))))) @@ -890,13 +911,13 @@ (define %test-lvm-separate-home-os (description "Test functionality of an OS installed with a LVM /home partition") (value - (mlet* %store-monad ((image (run-install %lvm-separate-home-os - %lvm-separate-home-os-source - #:script - %lvm-separate-home-installation-script - #:packages (list lvm2-static) - #:target-size (* 3200 MiB))) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %lvm-separate-home-os + %lvm-separate-home-os-source + #:script + %lvm-separate-home-installation-script + #:packages (list lvm2-static) + #:target-size (* 3200 MiB))) + (command (qemu-command* images))) (run-basic-test %lvm-separate-home-os `(,@command) "lvm-separate-home-os"))))) @@ -992,11 +1013,11 @@ (define %test-encrypted-root-not-boot-os store a couple of full system images.") (value (mlet* %store-monad - ((image (run-install %encrypted-root-not-boot-os - %encrypted-root-not-boot-os-source - #:script - %encrypted-root-not-boot-installation-script)) - (command (qemu-command* image))) + ((images (run-install %encrypted-root-not-boot-os + %encrypted-root-not-boot-os-source + #:script + %encrypted-root-not-boot-installation-script)) + (command (qemu-command* images))) (run-basic-test %encrypted-root-not-boot-os command "encrypted-root-not-boot-os" #:initialization enter-luks-passphrase))))) @@ -1068,11 +1089,11 @@ (define %test-btrfs-root-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %btrfs-root-os - %btrfs-root-os-source - #:script - %btrfs-root-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %btrfs-root-os + %btrfs-root-os-source + #:script + %btrfs-root-installation-script)) + (command (qemu-command* images))) (run-basic-test %btrfs-root-os command "btrfs-root-os"))))) @@ -1136,11 +1157,11 @@ (define %test-btrfs-raid-root-os 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* image))) + ((images (run-install %btrfs-raid-root-os + %btrfs-raid-root-os-source + #:script %btrfs-raid-root-installation-script + #:target-size (* 2800 MiB))) + (command (qemu-command* images))) (run-basic-test %btrfs-raid-root-os `(,@command) "btrfs-raid-root-os"))))) @@ -1227,12 +1248,11 @@ (define %test-btrfs-root-on-subvolume-os build (current-guix) and then store a couple of full system images.") (value (mlet* %store-monad - ((image - (run-install %btrfs-root-on-subvolume-os - %btrfs-root-on-subvolume-os-source - #:script - %btrfs-root-on-subvolume-installation-script)) - (command (qemu-command* image))) + ((images (run-install %btrfs-root-on-subvolume-os + %btrfs-root-on-subvolume-os-source + #:script + %btrfs-root-on-subvolume-installation-script)) + (command (qemu-command* images))) (run-basic-test %btrfs-root-on-subvolume-os command "btrfs-root-on-subvolume-os"))))) @@ -1302,11 +1322,11 @@ (define %test-jfs-root-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %jfs-root-os - %jfs-root-os-source - #:script - %jfs-root-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %jfs-root-os + %jfs-root-os-source + #:script + %jfs-root-installation-script)) + (command (qemu-command* images))) (run-basic-test %jfs-root-os command "jfs-root-os"))))) @@ -1375,11 +1395,11 @@ (define %test-f2fs-root-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %f2fs-root-os - %f2fs-root-os-source - #:script - %f2fs-root-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %f2fs-root-os + %f2fs-root-os-source + #:script + %f2fs-root-installation-script)) + (command (qemu-command* images))) (run-basic-test %f2fs-root-os command "f2fs-root-os"))))) @@ -1448,11 +1468,11 @@ (define %test-xfs-root-os This test is expensive in terms of CPU and storage usage since we need to build (current-guix) and then store a couple of full system images.") (value - (mlet* %store-monad ((image (run-install %xfs-root-os - %xfs-root-os-source - #:script - %xfs-root-installation-script)) - (command (qemu-command* image))) + (mlet* %store-monad ((images (run-install %xfs-root-os + %xfs-root-os-source + #:script + %xfs-root-installation-script)) + (command (qemu-command* images))) (run-basic-test %xfs-root-os command "xfs-root-os"))))) @@ -1720,22 +1740,22 @@ (define* (guided-installation-test name "Install an OS using the graphical installer and test it.") (value (mlet* %store-monad - ((image (run-install target-os '(this is unused) - #:script #f - #:os installation-os-for-gui-tests - #:uefi-support? uefi-support? - #:install-size install-size - #:target-size target-size - #:installation-image-type - 'uncompressed-iso9660 - #:gui-test - (lambda (marionette) - (gui-test-program - marionette - #:desktop? desktop? - #:encrypted? encrypted? - #:uefi-support? uefi-support?)))) - (command (qemu-command* image + ((images (run-install target-os '(this is unused) + #:script #f + #:os installation-os-for-gui-tests + #:uefi-support? uefi-support? + #:install-size install-size + #:target-size target-size + #:installation-image-type + 'uncompressed-iso9660 + #:gui-test + (lambda (marionette) + (gui-test-program + marionette + #:desktop? desktop? + #:encrypted? encrypted? + #:uefi-support? uefi-support?)))) + (command (qemu-command* images #:uefi-support? uefi-support? #:memory-size 512))) (run-basic-test target-os command name -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 13 00:44:59 2022 Received: (at 54368) by debbugs.gnu.org; 13 Mar 2022 05:44:59 +0000 Received: from localhost ([127.0.0.1]:41415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2I-0007rV-It for submit@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:58 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:40512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTH2F-0007qs-Lh for 54368@debbugs.gnu.org; Sun, 13 Mar 2022 00:44:56 -0500 Received: by mail-qt1-f172.google.com with SMTP id g7so4105688qtg.7 for <54368@debbugs.gnu.org>; Sat, 12 Mar 2022 21:44:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lW2SM29s91L5EZOTzJWueMpB5Qz0ejBxm7L3Q/dF5Qo=; b=q03weZ5fsw7HWiHTuBQAQsSX8U36x4MdXJXMIds11EICbwlJlRv/UN4wQvIVnwW6jy OahW2RuCM7RG7q33v4YCWT/3MiPryoMDhQs6sZwiBgXThFx55XVFxSfCQM1z4wsmRChp zkSM+FIhQgy+7FofpgXcCG97tUNSYEM8Pd3Srr324Atdy/jZoqDXWTdOgSU1K5IEtV70 CRVi/cm5BvYeQQbVXZdTLJ8UXtRc2IrisdR+ULytB55Ksks43SlgKGuiKShxJ6ig/dVi afaJhBLlhu9pv2aoDZ7k/rWgOBOanWs9YRHMzLPdyiX23z493b7QgRjmJzRYCBZaK5xg weug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lW2SM29s91L5EZOTzJWueMpB5Qz0ejBxm7L3Q/dF5Qo=; b=H2GueU2vmIBmaY4z3wHSPCnQP1LmNGrKBEYWDPPNqPm3eygohm0+etOscM6E9/1Stk 1ZRTAHCLIMY59hL2tDIXMjgisxg4oKnD2F4SNVEpJ1B1AafR9WbUfBD901LWuFuauOkm 3nPO5taQ9K/5p+76TKa1FWeS7eC9cSEGJD2qjuZ9kOnyGoDKL6Nl3/7CWKNr+SKjA2lm uj5y+L4jLu8UYmW73oRoG3aGgIWZAxz4LiHDGOMGMWTgLPJXh5OwH/08xze+/YYdAQPP r3YoWeBoFyfJhMwaYivUzv2a72wb0eEA75XIS5x8C7aDzIQrv7rkrs1ArkToBhy02Bvp 68vQ== X-Gm-Message-State: AOAM533cTsX9Fhty+BlRc/zZ1vMAbH6n1trFtk2md7/5FzHFE19upu0o zzvB85GttvZ1U7qDyLvEsO8VJ10kqC0= X-Google-Smtp-Source: ABdhPJyAf0XTblLnufSQ/vpow/0TIVFzCc2v3zZlvFZjGdK/qadR/ZImiazgDVP7WrjVl1B9xdqcAQ== X-Received: by 2002:ac8:578f:0:b0:2e1:ce21:43a9 with SMTP id v15-20020ac8578f000000b002e1ce2143a9mr1061555qta.521.1647150290000; Sat, 12 Mar 2022 21:44:50 -0800 (PST) Received: from localhost.localdomain (dsl-153-119.b2b2c.ca. [66.158.153.119]) by smtp.gmail.com with ESMTPSA id v129-20020a379387000000b0064936bab2fcsm6376657qkd.48.2022.03.12.21.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 21:44:49 -0800 (PST) From: Maxim Cournoyer To: 54368@debbugs.gnu.org Subject: [PATCH 4/4] tests: install: Add two new Btrfs RAID10 install test. Date: Sun, 13 Mar 2022 00:43:55 -0500 Message-Id: <20220313054356.17578-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220313054356.17578-1-maxim.cournoyer@gmail.com> References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/tests/install.scm (%btrfs-raid10-root-os) (%btrfs-raid10-root-os): New variables. (%btrfs-raid10-root-installation-script): Likewise. (%test-btrfs-raid10-root-images): Likewise. (%test-btrfs-raid10-root-os, %test-btrfs-raid10-root-os-degraded): New tests. --- gnu/tests/install.scm | 113 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 1 deletion(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 59e76c86e7..79a7490e7a 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2020, 2021 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +70,8 @@ (define-module (gnu tests install) %test-btrfs-root-os %test-btrfs-root-on-subvolume-os %test-btrfs-raid-root-os + %test-btrfs-raid10-root-os + %test-btrfs-raid10-root-os-degraded %test-jfs-root-os %test-f2fs-root-os %test-xfs-root-os @@ -1256,6 +1258,115 @@ (define %test-btrfs-root-on-subvolume-os (run-basic-test %btrfs-root-on-subvolume-os command "btrfs-root-on-subvolume-os"))))) + +;;; +;;; Btrfs RAID10 root file system. +;;; + +(define-os-with-source (%btrfs-raid10-root-os + %btrfs-raid10-root-os-source) + ;; The OS we want to install. + (use-modules (gnu) (gnu tests) (srfi srfi-1)) + + (operating-system + (host-name "hurd") + (timezone "Europe/Paris") + (locale "en_US.UTF-8") + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (targets (list "/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde")))) + (kernel-arguments '("console=ttyS0")) + (file-systems (cons* (file-system + (device (uuid "16ff18e2-eb41-4324-8df5-80d3b53c411b")) + (mount-point "/") + (options "compress-force=zstd,degraded") + (type "btrfs")) + %base-file-systems)) + (users (cons (user-account + (name "charlie") + (group "users") + (supplementary-groups '("wheel" "audio" "video"))) + %base-user-accounts)) + (services (cons (service marionette-service-type + (marionette-configuration + (imported-modules '((gnu services herd) + (guix combinators))))) + %base-services)))) + +(define %btrfs-raid10-root-installation-script + ;; Shell script of a simple installation. + "\ +. /etc/profile +set -e -x +guix --version + +export GUIX_BUILD_OPTIONS=--no-grafts +ls -l /run/current-system/gc-roots +for d in vdb vdc vdd vde; do + parted --script /dev/$d mklabel gpt \\ + mkpart primary ext2 1M 2M \\ + mkpart primary ext2 2M 100% \\ + set 1 boot on \\ + set 1 bios_grub on +done + +# Create the RAID10 Btrfs array. +mkfs.btrfs -d raid10 -m raid1c4 /dev/{vdb2,vdc2,vdd2,vde2} \\ + --uuid 16ff18e2-eb41-4324-8df5-80d3b53c411b + +# Mount it, ready for installation. +mount UUID=16ff18e2-eb41-4324-8df5-80d3b53c411b -o compress-force=zstd /mnt + +herd start cow-store /mnt +mkdir /mnt/etc +cp /etc/target-config.scm /mnt/etc/config.scm +guix system build /mnt/etc/config.scm +guix system init /mnt/etc/config.scm /mnt --no-substitutes +sync +reboot\n") + +(define %test-btrfs-raid10-root-images + (mlet %store-monad + ((images (run-install %btrfs-raid10-root-os + %btrfs-raid10-root-os-source + #:script + %btrfs-raid10-root-installation-script + #:number-of-disks 4 + #:target-size (* 1100 MiB)))) + (return images))) + +(define %test-btrfs-raid10-root-os + (system-test + (name "btrfs-raid10-root-os") + (description + "Test basic functionality of an OS installed on top of a Btrfs RAID10 file +system spanning 4 disks. This test is expensive in terms of CPU and storage +usage since we need to build (current-guix) and then store a couple of full +system images.") + (value + (mlet* %store-monad + ((images %test-btrfs-raid10-root-images) + (command (qemu-command* images))) + (run-basic-test %btrfs-raid10-root-os command + "btrfs-raid10-root-os"))))) + +(define %test-btrfs-raid10-root-os-degraded + (system-test + (name "btrfs-raid10-root-os-degraded") + (description + "Test basic functionality of an OS installed on top of a Btrfs RAID10 file +system spanning 4 disks, degraded to 3 disks. This test is expensive in terms +of CPU and storage usage since we need to build (current-guix) and then store +a couple of full system images.") + (value + (mlet* %store-monad + ;; Drop the first image; this boots because the root file system uses + ;; the Btrfs "degraded" mount option. + ((images %test-btrfs-raid10-root-images) + (command (qemu-command* #~(cdr #$images)))) + (run-basic-test %btrfs-raid10-root-os command + "btrfs-raid10-root-os"))))) + ;;; ;;; JFS root file system. -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 05:40:31 2022 Received: (at 54368) by debbugs.gnu.org; 18 Mar 2022 09:40:32 +0000 Received: from localhost ([127.0.0.1]:56327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV95z-0002Rw-KJ for submit@debbugs.gnu.org; Fri, 18 Mar 2022 05:40:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV95y-0002Rj-3U for 54368@debbugs.gnu.org; Fri, 18 Mar 2022 05:40:30 -0400 Received: from [2001:470:142:3::e] (port=50816 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV95s-0005b2-RX; Fri, 18 Mar 2022 05:40:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=gE+9gZIKgkOP7U/N96iDzQp/RyRREdcHO491rr+mNaY=; b=St4QaPUagpIu0I8IyPa4 lNJI/iopTb1l8zwR5Ll0YZ24ozwe8NxE+yC6DS+LQps6cgvx9xWi/8IiYNJZ48X/c5JVxXfPLeT/E Xy/tJRNo719azUJk3R9VY7NERezgEqdsbMAMKKQFXJEL91NanMgnob18uKdhnpWk0GeMrdnceDAFg oJkHy1mOThfRXus5fOD6EWvOfFsog+W12abWhUH6DVi1/sP9DTvdofFuh8Q0r+sydKFFQ0/jYMs/O gDYMmHVY6Aqy8hxPTCd6aRDzMaNux2izffONK3IbgqLkoO4yDdMqEapvUJlFNFjDbJAc+hGVkRGrm gVrCHjTXyzK4Gg==; Received: from 71.125.192.77.rev.sfr.net ([77.192.125.71]:59558 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV95k-0001Kn-9q; Fri, 18 Mar 2022 05:40:23 -0400 From: Mathieu Othacehe To: Maxim Cournoyer Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> Date: Fri, 18 Mar 2022 10:40:13 +0100 In-Reply-To: <20220313054356.17578-3-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 13 Mar 2022 00:43:54 -0500") Message-ID: <87bky38upu.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54368 Cc: 54368@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Maxim, This looks great! I created a dedicated jobset here: https://ci.guix.gnu.org/jobset/wip-btrfs-raid-tests to check everything is still running fine. > +OS to install TARGET-OS. Return the VM disk images of TARGET-SIZE bytes > +containing the installed system. Unless providing OS, the PACKAGES will be > +added to the packages defined in INSTALLATION-OS (from (gnu system install)). > +NUMBER-OF-DISKS can be used to specify a number of disks different than one, > +such as for RAID systems." I'm having troubles understanding the "Unless providing OS" part of the sentence, but that's also because this mechanism of adding packages to the default OS definition is tricky. Maybe we should augment the OS definition with those packages unconditionally in the body of the "run-install" procedure. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 05:41:41 2022 Received: (at 54368) by debbugs.gnu.org; 18 Mar 2022 09:41:41 +0000 Received: from localhost ([127.0.0.1]:56332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV976-0002Tu-WC for submit@debbugs.gnu.org; Fri, 18 Mar 2022 05:41:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV975-0002Ti-GO for 54368@debbugs.gnu.org; Fri, 18 Mar 2022 05:41:39 -0400 Received: from [2001:470:142:3::e] (port=50960 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV970-0005lq-8T; Fri, 18 Mar 2022 05:41:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=xRs1g2K/BVI9nGSunKAPHt3Ud+IeuJVq85Ud0G1m1gY=; b=UeTKdOH7jvEE3J8P4665 wBuC391QxSUuw8kXnhhqRdMELPHcF/E3PnXjQdt7ig5pgYRCs7+FTOBalEuasVl6OtHFSr4/nhvu/ iM47q0TY9M91aApxxzWQHBU8s2mTfjH53/P7G3JTRxLjZRlP+pL9pxfwI6vfW4/xOT0HX/TaiywUu nYxHVfT6EKToxDpXQHNZTDylzZDRTHzLTOxgLcTj2nWJA7g4FkWCdyo68vzH6+sIHaTXiVrgQtQKB C49L76DrKE4bqlHnP/8qizkP38BhRErzUjw0ZZaAiA2AWN83QP1IGPGx4kZow/Ll4qY6ZaeTS9qDX vS4bDXgMSGOYcg==; Received: from 71.125.192.77.rev.sfr.net ([77.192.125.71]:59560 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV96z-0001W5-R7; Fri, 18 Mar 2022 05:41:34 -0400 From: Mathieu Othacehe To: Maxim Cournoyer Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> Date: Fri, 18 Mar 2022 10:41:31 +0100 In-Reply-To: <20220313054356.17578-3-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 13 Mar 2022 00:43:54 -0500") Message-ID: <877d8r8uno.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54368 Cc: 54368@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > -above IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." > +on top of IMAGES, a list disk images. The QEMU VM has access to MEMORY-SIZE "a list disk images."? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 09:28:46 2022 Received: (at 54368) by debbugs.gnu.org; 18 Mar 2022 13:28:46 +0000 Received: from localhost ([127.0.0.1]:56531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVCer-0002bY-QX for submit@debbugs.gnu.org; Fri, 18 Mar 2022 09:28:46 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:40807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVCep-0002bJ-GO for 54368@debbugs.gnu.org; Fri, 18 Mar 2022 09:28:44 -0400 Received: by mail-qt1-f172.google.com with SMTP id i4so6792658qti.7 for <54368@debbugs.gnu.org>; Fri, 18 Mar 2022 06:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=XGM5eteU5P94+x7m0TQ0bCla0vt4ggrSc97FAXtuSHY=; b=FCQJQ6sx7hoqc65h7LgGKQMF5tyZRrrQxlaBGojhOaoftx4GQKvDsOAVSoX/+6UzXn pB74TStSt+nZLGEFGRz+0L1iGho/3LjkUv+UnS2O+djs2M58sGAD/XZjscHJ3ZVCScz0 TIj0ccIsXV35gtNPz4s8R6Px6aTPb/dkRTq3/IvF6N7+6Bp4Uok+yIc4kdjTVJBrLYz6 pwy76Tceirt8jbeGuA3dwUEjytYQEwnzDTX1scjEfA+hP8XFRw3LM65YUoU3zRqSArC2 2OfeePXumUHTFpGlcBiZtr8EOpQ0nDYl2bPrKFAE4k0fUIskJe2G69bpEJTi6gPY4Yge aLgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=XGM5eteU5P94+x7m0TQ0bCla0vt4ggrSc97FAXtuSHY=; b=EW0+34CuTFW9kQluXU+214tEGBeSJo11zTH5JqTyIDAJwBziueZwG9yk5Xz507Z9Wn 5YTYexL2sBBNVvwr/W7sVGw5JxFVOjulsvH1TZ/HukVVRsmOfGWEmVjJN+w7UXuiK5Fd 08zmV9m7cflEm7BUW8YOvg7BjKHM20A985sOn9hEAhOvjM/SokeTLbhbzX911wSJz5bC 2JXOTj3Tue6/HHu+u75yPVhwLUUutAFOZlmietQ9ya6QQvrWDPfLplBa0uNkf52q50f4 7vuQqWRlqAhDpwJZfzbM9kQe8rvmJ1fW/hSLHd+G3hQf1AkO0yylbjZOmxZ8ZDG6e4LU gMeQ== X-Gm-Message-State: AOAM532c1euoH+45jKyG9DLHMGfZ1M5mct951spSeP9IpxswIDvtnwC0 BWnpKxfiVgxMahowe34Kp6bW2QGKYE83nA== X-Google-Smtp-Source: ABdhPJwLfQoEsNNTe2hXFUAsuAFMf/Vp2QwntyvolFuAqZuiA4aBOE/NL/kbaUdBCXfZB21XtsXr1Q== X-Received: by 2002:a05:622a:4d3:b0:2e1:bc11:3b97 with SMTP id q19-20020a05622a04d300b002e1bc113b97mr7334192qtx.189.1647610117673; Fri, 18 Mar 2022 06:28:37 -0700 (PDT) Received: from hurd (dsl-10-132-234.b2b2c.ca. [72.10.132.234]) by smtp.gmail.com with ESMTPSA id x19-20020a05620a14b300b0067e09a47e39sm3736867qkj.34.2022.03.18.06.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:28:37 -0700 (PDT) From: Maxim Cournoyer To: Mathieu Othacehe Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> <87bky38upu.fsf_-_@gnu.org> Date: Fri, 18 Mar 2022 09:28:36 -0400 In-Reply-To: <87bky38upu.fsf_-_@gnu.org> (Mathieu Othacehe's message of "Fri, 18 Mar 2022 10:40:13 +0100") Message-ID: <87sfrf4cfv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: 54368@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mathieu, Mathieu Othacehe writes: > Hello Maxim, > > This looks great! I created a dedicated jobset here: > https://ci.guix.gnu.org/jobset/wip-btrfs-raid-tests to check everything > is still running fine. > >> +OS to install TARGET-OS. Return the VM disk images of TARGET-SIZE bytes >> +containing the installed system. Unless providing OS, the PACKAGES will be >> +added to the packages defined in INSTALLATION-OS (from (gnu system install)). >> +NUMBER-OF-DISKS can be used to specify a number of disks different than one, >> +such as for RAID systems." > > I'm having troubles understanding the "Unless providing OS" part of the > sentence, but that's also because this mechanism of adding packages to > the default OS definition is tricky. > > Maybe we should augment the OS definition with those packages > unconditionally in the body of the "run-install" procedure. Yes, it's a bit weird that we accept an argument whose only purpose is to affect the default value of another argument! I'll try implementing your idea; I also think it's better. Thank you! Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 09:31:14 2022 Received: (at 54368) by debbugs.gnu.org; 18 Mar 2022 13:31:15 +0000 Received: from localhost ([127.0.0.1]:56539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVChG-0002hA-LK for submit@debbugs.gnu.org; Fri, 18 Mar 2022 09:31:14 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:40854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVChF-0002gy-M8 for 54368@debbugs.gnu.org; Fri, 18 Mar 2022 09:31:14 -0400 Received: by mail-qk1-f180.google.com with SMTP id i65so901025qkd.7 for <54368@debbugs.gnu.org>; Fri, 18 Mar 2022 06:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=xBjid2njJO9mCK6n5Ht6Z2wxE/zKUmvZ8yfFn6fSBJo=; b=CaconYh0H0etNNm7tUglkd2DUUJ/jATMXXUW8Grf5Ywi1sU29i3etZSFLG2lrI8tMH wk4dGOIcWnU3V8azKhKVhti7KMKm2X+Jq82SOwn81LPee1uZZy8KeiO/7HXoXNyvtXsw /1pbvwzrdcvuW83k3YWlNhKW+HE8jgGjzwHVYG68kzwWGVQ4ocOSdHbX4/YzaNC63U3w 7A2137cAAUFGNRTXEdytprCigp1e3VslZPVI15X4b7ih36bMyn2RgS63tu3VxlSE4PUD qMfIXCm5jKkwcrNK8pFvv9jR9Z3ovxihqZzyA26OIde1KSxZaEN8xbnS9LhHyQhoyiYG S6rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=xBjid2njJO9mCK6n5Ht6Z2wxE/zKUmvZ8yfFn6fSBJo=; b=RPjavdvWH9c6qrkF9ZOq0Hj501s8emJ4INMwxmVFel9f/2mELnm0zGDUEtdVpFgeYl eu9SQiVzTzTC4xWX4C5z/CIvoJFUBm/xcs+8pNoAw9TMpK+SIYrvt0wvaV9k7F+GH5Cq /zjlqGDp7J5qHrOIm2XDs9yErSBsZ/ds+/YD7bqAaAvf7fv7ZUq5gQdHO9MykRnfowja dg3g8ybX9liNMXDc9BXka8ceNMPvVCmdq4kqgxYY6NpplVQwT2aUOCRPU8N/KMcMjCzE bRPnytYhh8Ne2mK/drSABkfYRcYdM6wktmRJGdIqkfXXbEEG3RgTRYN5UBE2dXXPN9a7 ew/A== X-Gm-Message-State: AOAM530zRli4CvUIylZFj2JiORN9Mz8797AayR/KizMah9u9k2fOtrHP 4QOnm5+FdNq2M0VRKcSWmJhcsc0mdZfX4g== X-Google-Smtp-Source: ABdhPJywwcNsfC2/NDeRYa5oO4U6N7Pdo9/DCrVs9ZIeQ9esxhasz/QEzCcE3Tt/d2C2tLSc6pMZ0g== X-Received: by 2002:a05:620a:2805:b0:67d:5c7e:c43a with SMTP id f5-20020a05620a280500b0067d5c7ec43amr5845559qkp.84.1647610267694; Fri, 18 Mar 2022 06:31:07 -0700 (PDT) Received: from hurd (dsl-10-132-234.b2b2c.ca. [72.10.132.234]) by smtp.gmail.com with ESMTPSA id f206-20020a379cd7000000b0067e620f0d1dsm369388qke.129.2022.03.18.06.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:31:07 -0700 (PDT) From: Maxim Cournoyer To: Mathieu Othacehe Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> <877d8r8uno.fsf_-_@gnu.org> Date: Fri, 18 Mar 2022 09:31:06 -0400 In-Reply-To: <877d8r8uno.fsf_-_@gnu.org> (Mathieu Othacehe's message of "Fri, 18 Mar 2022 10:41:31 +0100") Message-ID: <87o8234cbp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368 Cc: 54368@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Mathieu Othacehe writes: >> -above IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." >> +on top of IMAGES, a list disk images. The QEMU VM has access to MEMORY-SIZE > > "a list disk images."? Indeed, fixed :-). About the dedicated jobset, there seems to be a couple failures that are more CI-related? Such as: --8<---------------cut here---------------start------------->8--- @ substituter-succeeded /gnu/store/qb6n55c7anrilw0pb0lspxxm3xyrmj4x-guix-translated-texinfo.drv fetching path `/gnu/store/yc1nj4dp0dygr3a4nfa3r1g7dll2kzcg-guix-manual.drv'... @ substituter-started /gnu/store/yc1nj4dp0dygr3a4nfa3r1g7dll2kzcg-guix-manual.drv substitute Downloading http://141.80.167.131/nar/gzip/yc1nj4dp0dygr3a4nfa3r1g7dll2kzcg-guix-manual.drv... [K guix-manual.drv 679B 0B/s 00:00 [ ] 0.0% [K guix-manual.drv 679B 657KiB/s 00:00 [##################] 100.0% [K guix-manual.drv 679B 449KiB/s 00:00 [##################] 100.0% @ substituter-succeeded /gnu/store/yc1nj4dp0dygr3a4nfa3r1g7dll2kzcg-guix-manual.drv cannot build missing derivation ?/gnu/store/x7z4y134cx5il1ifbzqhdfmqc3b1980w-btrfs-raid10-root-os.drv? --8<---------------cut here---------------end--------------->8--- Are you able to interpret such failure? Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 11:26:27 2022 Received: (at 54368) by debbugs.gnu.org; 18 Mar 2022 15:26:27 +0000 Received: from localhost ([127.0.0.1]:58113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVEUk-0008Rs-V6 for submit@debbugs.gnu.org; Fri, 18 Mar 2022 11:26:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVEUj-0008Rc-Iz for 54368@debbugs.gnu.org; Fri, 18 Mar 2022 11:26:25 -0400 Received: from [2001:470:142:3::e] (port=50016 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVEUe-0006F5-Am; Fri, 18 Mar 2022 11:26:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=8Jm8oq5Yk3lSvepWlPg+zzuIgKmofmGd9TmqPcZXye4=; b=SjDyQCMWC3J2NbhznEJF btr/LlNFY6pBs93BkGvWAgQ346epmY005YHid5EpLKF+Ooin5njjo1G9e28viQm1yPXImBiGs+Tnx YaIvWGlz2S9px1xnsD88CREDmXP9LwnPy8xCNuBA1+4EHCUXZ0Kr4cv62Kvi0EHUEqmYn13Dn85KY 0qEE1tnSsOrycVeaGyg1MjB1PUNRBgzPBxnVWSqDDDLbEjOTmQNSA8MQhB8YaTxuKjhV6MUIf+mdN 6C7zpnxY2O7MR+eHGlLpfrZiQ9jhirIdSe0HVoay6oRcKBSUQpyTeZFmnTTn7Dsj2SsBV4rLmuxGu MVvQcsE0REq+rg==; Received: from 71.125.192.77.rev.sfr.net ([77.192.125.71]:59574 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVEUd-00047O-Ts; Fri, 18 Mar 2022 11:26:20 -0400 From: Mathieu Othacehe To: Maxim Cournoyer Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> <877d8r8uno.fsf_-_@gnu.org> <87o8234cbp.fsf@gmail.com> Date: Fri, 18 Mar 2022 16:26:17 +0100 In-Reply-To: <87o8234cbp.fsf@gmail.com> (Maxim Cournoyer's message of "Fri, 18 Mar 2022 09:31:06 -0400") Message-ID: <87ee2z8ep2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54368 Cc: 54368@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey, > @ substituter-succeeded /gnu/store/yc1nj4dp0dygr3a4nfa3r1g7dll2kzcg-guix-manual.drv > cannot build missing derivation ?/gnu/store/x7z4y134cx5il1ifbzqhdfmqc3b1980w-btrfs-raid10-root-os.drv? > > Are you able to interpret such failure? Nothing to related to your patches I think, reported here: https://issues.guix.gnu.org/54447. Quite unfortunate though as the installation tests are all failing because of this problem :(. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 19 11:31:44 2022 Received: (at 54368-done) by debbugs.gnu.org; 19 Mar 2022 15:31:44 +0000 Received: from localhost ([127.0.0.1]:60434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVb3P-0003qy-Ub for submit@debbugs.gnu.org; Sat, 19 Mar 2022 11:31:44 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:45789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVb3P-0003qn-1K for 54368-done@debbugs.gnu.org; Sat, 19 Mar 2022 11:31:43 -0400 Received: by mail-qk1-f169.google.com with SMTP id h196so8820358qke.12 for <54368-done@debbugs.gnu.org>; Sat, 19 Mar 2022 08:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=5uScJ9bqCZH7a0NHWruTP0XjOyT3qbyIgjwmHZetAHA=; b=PV92K8HHdQGt1IN3TrIr+B8EgajYBVp/6wJymho8BRu/lyceyzJDdnth6KNh1sHc6f jsgPflDeRoCKwyLoLjsz/SpANHbaoSCTbqsTNfixB33HnnXOciJ+UQsiUPp5KaQl99Ih WchBrrvo2Uzyf9acmrDG0Cbb5oF4ialLYEwnGuqOzKx5NHVmBGbTGg2Uj94x2glHo9Lg kSHP/PWN0N4oUU4yD/l6jmVo/O/t+CoOoyaP5ZvfQsqJpwhiw5INXq7EDA7g0U5982ff dt495bPZq838716aCKely9toccP5cibbnpVcXX5n3wsxEeYNVMnfWZV9MOJ+DJ/XX3c8 tSeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=5uScJ9bqCZH7a0NHWruTP0XjOyT3qbyIgjwmHZetAHA=; b=WuuKNFP4A+f/SRsVskc9PjyBFPXf9ttX9BR2Pi0wI8Uq7nxvQVmkkF94tQt85NTpzZ M3Eco0s4uENji1OXyjNszZsnT1ePBp4iuwVX6+X7RVkKYXWREMoA0nKP0RectV4t+r/y OvpGCYLy9Uz794vptDbT0AJYkWlAnC+caVPL3jmTcds0SrfQqk+ZKDO4BOm44Ps2uhGM xasq+pK9sVcfqeQhLB2zTS2k1rNPX3XlFIcZLptiNNo/Mz9GUVifxQcLl310STfjhGmW OoGLAd+ysphDf7bKvs7miSefb5kKExgJbaheUA5brdwrMPBwgbrldl+cnqEvia2Wf1Xv NujQ== X-Gm-Message-State: AOAM530wd24S4MY2suhArDXx7mqokqKtY7TFNOwhVThg8BGwyO/LaMzZ iXh491FDMU0luRm2adWJiulsRFBDums= X-Google-Smtp-Source: ABdhPJwfXkXRjTxkPnrPvaSL7oUmROL+zZqykxvqpevJE+Fb+uU9GfKekcIT99erSesEHV/HgZbU4g== X-Received: by 2002:a05:620a:4403:b0:67d:b751:361f with SMTP id v3-20020a05620a440300b0067db751361fmr8724639qkp.347.1647703897268; Sat, 19 Mar 2022 08:31:37 -0700 (PDT) Received: from hurd (dsl-10-132-234.b2b2c.ca. [72.10.132.234]) by smtp.gmail.com with ESMTPSA id v12-20020a05622a130c00b002e1b3ccd9adsm8190723qtk.79.2022.03.19.08.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 08:31:36 -0700 (PDT) From: Maxim Cournoyer To: Mathieu Othacehe Subject: Re: bug#54368: [PATCH 0/4] Add Btrfs RAID10 install tests. References: <20220313054356.17578-1-maxim.cournoyer@gmail.com> <20220313054356.17578-3-maxim.cournoyer@gmail.com> <87bky38upu.fsf_-_@gnu.org> Date: Sat, 19 Mar 2022 11:31:35 -0400 In-Reply-To: <87bky38upu.fsf_-_@gnu.org> (Mathieu Othacehe's message of "Fri, 18 Mar 2022 10:40:13 +0100") Message-ID: <87k0cq3qnc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54368-done Cc: 54368-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mathieu, Mathieu Othacehe writes: > Hello Maxim, > > This looks great! I created a dedicated jobset here: > https://ci.guix.gnu.org/jobset/wip-btrfs-raid-tests to check everything > is still running fine. > >> +OS to install TARGET-OS. Return the VM disk images of TARGET-SIZE bytes >> +containing the installed system. Unless providing OS, the PACKAGES will be >> +added to the packages defined in INSTALLATION-OS (from (gnu system install)). >> +NUMBER-OF-DISKS can be used to specify a number of disks different than one, >> +such as for RAID systems." > > I'm having troubles understanding the "Unless providing OS" part of the > sentence, but that's also because this mechanism of adding packages to > the default OS definition is tricky. > > Maybe we should augment the OS definition with those packages > unconditionally in the body of the "run-install" procedure. This is now done unconditionally. I've also fixed the typo reported in another email on this thread, thank you! Retested with 'make check-system TESTS=btrfs-raid10-root-os' and pushed with commit b45a301618. Thanks for the review! Maxim From unknown Sat Aug 16 22:00:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 17 Apr 2022 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator