From patchwork Thu Jan 11 17:32:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58794 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 981FA27BBEA; Thu, 11 Jan 2024 17:33:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D302927BBE2 for ; Thu, 11 Jan 2024 17:33:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNyvW-000475-8h; Thu, 11 Jan 2024 12:33:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNyvU-00045c-1N for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNyvT-0001hF-NY for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNyvR-0007iG-5k for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65002] [PATCH 6/6] tests: install: Fix encrypted-home-os, encrypted-home-os-key-file tests. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jan 2024 17:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65002 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65002@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 65002-submit@debbugs.gnu.org id=B65002.170499436329584 (code B ref 65002); Thu, 11 Jan 2024 17:33:05 +0000 Received: (at 65002) by debbugs.gnu.org; 11 Jan 2024 17:32:43 +0000 Received: from localhost ([127.0.0.1]:33754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNyv4-0007gz-RL for submit@debbugs.gnu.org; Thu, 11 Jan 2024 12:32:43 -0500 Received: from wolfsden.cz ([37.205.8.62]:45670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rNyuy-0007fz-G0 for 65002@debbugs.gnu.org; Thu, 11 Jan 2024 12:32:37 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id BC72424E78E; Thu, 11 Jan 2024 17:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704994356; bh=4W2mKhUSO+cz/tcGaBbvev3+QUVwWLGHOFB6itFgAnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L1521DcskwzLN1WkgD4qgvke6pKCKCFW4h4AMEEQNa3W6ohGZja3zaHeBEd1Ij8Ve EBu2lc1pS7Pu8AZjwN+pnZyNUp6JhBS81VhVXvGQjZgBdat+zEsxIuzf8q+i9qYUqT bs1kJ2fLBmNz5GdIEtbgtnAQh3fLGTu2ss0Qq90Oy+vdYkYO4Gq51za5YYBd5GqQWv x1KLgy82I/R7Aagzf2E4LnfxTw9GaNIThfx74ZC5saZ2OYM07acVba5jSfjjaW32WO bbE9lipKu4eQ9ktIqzzxVOhN8Aw/57y30BtBIGoOb8drxY3GLalYyEWArxijqJs/XY SfmngO3vLTYFmnT4ma6jt9avRwlWpg6F5HtB4VWfWFMlyjD/KEytOoykXKRylKyh/i tSChWy4AovrKdQvT57Vq7+WWthRwxIT1oRQ/4m/hrSRG3n09/LoeALsBsdcuMSasjm fyYYOSA2Pu9XeIypUnu7vkOOpYhRSj3JTHjpnUTsfTn8FPl5YWErysV8drf8i9S7kw 9ghu4kBPgiLjlxeZ04GmVOFnrV3d3jbRWs1xr6xoVQfsPSOdeHkUgAK/++lxJnvGkp rpTLgxBA30MvqcwGfo91JmjtWCZqu9nD6CVhwLm2MbSBwijAoVBNnZNKHdHGNpbHPl qYi+HU2ckoyagy8Abxbqwsxk= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 6995024F5C1; Thu, 11 Jan 2024 17:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704994356; bh=4W2mKhUSO+cz/tcGaBbvev3+QUVwWLGHOFB6itFgAnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L1521DcskwzLN1WkgD4qgvke6pKCKCFW4h4AMEEQNa3W6ohGZja3zaHeBEd1Ij8Ve EBu2lc1pS7Pu8AZjwN+pnZyNUp6JhBS81VhVXvGQjZgBdat+zEsxIuzf8q+i9qYUqT bs1kJ2fLBmNz5GdIEtbgtnAQh3fLGTu2ss0Qq90Oy+vdYkYO4Gq51za5YYBd5GqQWv x1KLgy82I/R7Aagzf2E4LnfxTw9GaNIThfx74ZC5saZ2OYM07acVba5jSfjjaW32WO bbE9lipKu4eQ9ktIqzzxVOhN8Aw/57y30BtBIGoOb8drxY3GLalYyEWArxijqJs/XY SfmngO3vLTYFmnT4ma6jt9avRwlWpg6F5HtB4VWfWFMlyjD/KEytOoykXKRylKyh/i tSChWy4AovrKdQvT57Vq7+WWthRwxIT1oRQ/4m/hrSRG3n09/LoeALsBsdcuMSasjm fyYYOSA2Pu9XeIypUnu7vkOOpYhRSj3JTHjpnUTsfTn8FPl5YWErysV8drf8i9S7kw 9ghu4kBPgiLjlxeZ04GmVOFnrV3d3jbRWs1xr6xoVQfsPSOdeHkUgAK/++lxJnvGkp rpTLgxBA30MvqcwGfo91JmjtWCZqu9nD6CVhwLm2MbSBwijAoVBNnZNKHdHGNpbHPl qYi+HU2ckoyagy8Abxbqwsxk= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 11 Jan 2024 18:32:16 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The installation no longer fits into the 1.6G, leading to a warning while running the test: guix system: warning: at least 1526.8 MB needed but only 1408.4 MB available in /mnt Followed by a failure: 93% [#################################################################### ]note: build failure may have been caused by lack of free disk space builder for `/gnu/store/8wl8q8nc1za0vlyv21jpzwgml45njgk2-module-import-compiled.drv' failed with exit code 1 This commit increases the root partition to 2G, making the test pass again. * gnu/tests/install.scm (%encrypted-root-installation-script): Increase the root partition to 2G. (%test-encrypted-home-os), (%test-encrypted-home-os-key-file): Increase the target size to 3G to accommodate for the larger root partition. Change-Id: I0f7092f7b7fc9992d3f895a1eaecf1f2065b7360 --- gnu/tests/install.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index f553eeaa3e..f9e766e532 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -964,8 +964,8 @@ (define %encrypted-home-installation-script export GUIX_BUILD_OPTIONS=--no-grafts parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.6G \\ - mkpart primary 1.6G 2.0G \\ + mkpart primary ext2 3M 2G \\ + mkpart primary 2G 2.4G \\ set 1 boot on \\ set 1 bios_grub on @@ -1033,7 +1033,9 @@ (define %test-encrypted-home-os %encrypted-home-os-source #:script %encrypted-home-installation-script - #:packages (list cpio))) + #:packages (list cpio) + #:target-size + (* 3000 MiB))) (command (qemu-command* images))) (run-basic-test %encrypted-home-os command "encrypted-home-os" #:initialization enter-luks-passphrase-for-home))))) @@ -1090,7 +1092,9 @@ (define %test-encrypted-home-os-key-file %encrypted-home-os-key-file-source #:script %encrypted-home-installation-script - #:packages (list cpio))) + #:packages (list cpio) + #:target-size + (* 3000 MiB))) (command (qemu-command* images))) (run-basic-test %encrypted-home-os-key-file command "encrypted-home-os-key-file")))))