From patchwork Sat Mar 15 21:37:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 40221 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 4A32D27BBEA; Sat, 15 Mar 2025 21:39:38 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C3FE827BBE2 for ; Sat, 15 Mar 2025 21:39:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttZDs-0004xo-7A; Sat, 15 Mar 2025 17:39:12 -0400 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 1ttZDl-0004un-RZ for guix-patches@gnu.org; Sat, 15 Mar 2025 17:39:06 -0400 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 1ttZDl-0002mo-F5 for guix-patches@gnu.org; Sat, 15 Mar 2025 17:39:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=S+IKs4pr1pR4iSgRs+HL5omwv7CnO337JSiYV4uwBkc=; b=Ci6Mg6IeNWm/T9hMCocLFb2ZewTQLvpv6DPLx57wHcuayzYJFLQ3zZqA/SH0PgU4y4ZxEW7E+yMxIFBFl3Zx6HAAobgT03Lby9/hoU4gcEC+KnqhV7gYjvXpBauoHcsJX0ATRvjxAukrhR/eSX82O0j4Op/cHVC/caGkt0pyeo3m2KY0CpBOA448WkR5DTwuc044XLjCBpaPdACC4+B+2ZLEWvLlp8zVl313/vgIlz8H4VtnX63ekKGwis4tepchuYfoMpEkFkxqmENdyVqFngGj0XygJbabZ+TojFN2MDBAvzIi16dkbxkDYMgf9zSYR77pGCcjSmR52dBS5Ed0kQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttZDl-0004VW-0I for guix-patches@gnu.org; Sat, 15 Mar 2025 17:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77041] [PATCH 10/16] tests: ganeti: Write system log to /dev/console. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 21:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77041@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 77041-submit@debbugs.gnu.org id=B77041.174207473717237 (code B ref 77041); Sat, 15 Mar 2025 21:39:04 +0000 Received: (at 77041) by debbugs.gnu.org; 15 Mar 2025 21:38:57 +0000 Received: from localhost ([127.0.0.1]:43859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttZDc-0004Tt-S5 for submit@debbugs.gnu.org; Sat, 15 Mar 2025 17:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55780) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttZCs-0004Ng-TG for 77041@debbugs.gnu.org; Sat, 15 Mar 2025 17:38:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttZCn-0002i3-GA; Sat, 15 Mar 2025 17:38:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=S+IKs4pr1pR4iSgRs+HL5omwv7CnO337JSiYV4uwBkc=; b=nU1lxllXdqPZCeapYGCp Ukr2+InJ3/jaZJDPiflDfa6grLCOeZG8DVYdZYOukG+mQRj5vZRbQqiRgjCGdx+0cknhw8aPrTvR3 2F3jh8jw7mElFQkO8q1t+U5o6taOQxFDOsgd/efAtlZsNCGquLNbGMqNSJ+1MsHoDSVWI7glgeMnY X0QR5m/N1C5PjW6iZZ2cHivGkzw3iy2Ho8uRK4vqs5MQ8i2Jupf8xXccOJ74m4n8quyFQMGbdnQgX yECMYXQLp83L4lKb/DCY6zq1SYUqqDXL09OpmW9m5oW7ly4Vpu0rEqQxI+atOxujfKS0R7xFuQ36W FmVLo9tGUe4G2w==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 15 Mar 2025 22:37:16 +0100 Message-ID: <20e0f3fd05f4ec2a2b62cd25c050b72ac98dba38.1742073920.git.ludo@gnu.org> X-Mailer: git-send-email 2.48.1 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 * gnu/tests/ganeti.scm (%ganeti-os): Wrap in ‘operating-system-with-console-syslog’. Change-Id: Ie86ad640ad6a7c154f5768ac4250acdd0e8940af --- gnu/tests/ganeti.scm | 87 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index ce55c8e04f..42ed58d977 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -33,54 +33,55 @@ (define-module (gnu tests ganeti) #:export (%test-ganeti-kvm %test-ganeti-lxc)) (define %ganeti-os - (operating-system - (host-name "gnt1") - (timezone "Etc/UTC") - (locale "en_US.UTF-8") + (operating-system-with-console-syslog + (operating-system + (host-name "gnt1") + (timezone "Etc/UTC") + (locale "en_US.UTF-8") - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets '("/dev/vda")))) - (file-systems (cons (file-system - (device (file-system-label "my-root")) - (mount-point "/") - (type "ext4")) - %base-file-systems)) - (firmware '()) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (targets '("/dev/vda")))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + (firmware '()) - (packages (append (list ganeti-instance-debootstrap ganeti-instance-guix) - %base-packages)) + (packages (append (list ganeti-instance-debootstrap ganeti-instance-guix) + %base-packages)) - ;; The hosts file must contain a nonlocal IP for host-name. - (essential-services - (modify-services (operating-system-default-essential-services this-operating-system) - (hosts-service-type config => (list - (host "127.0.0.1" "localhost") - (host "::1" "localhost"))))) - (services - (append (list (service static-networking-service-type - (list %qemu-static-networking)) - (service openssh-service-type - (openssh-configuration - (permit-root-login 'prohibit-password))) + ;; The hosts file must contain a nonlocal IP for host-name. + (essential-services + (modify-services (operating-system-default-essential-services this-operating-system) + (hosts-service-type config => (list + (host "127.0.0.1" "localhost") + (host "::1" "localhost"))))) + (services + (append (list (service static-networking-service-type + (list %qemu-static-networking)) + (service openssh-service-type + (openssh-configuration + (permit-root-login 'prohibit-password))) - ;; In addition, the cluster name must resolve to an IP address that - ;; is not currently provisioned. - (simple-service 'ganeti-host-entries hosts-service-type - (list - (host "10.0.2.15" "gnt1.example.com" '("gnt1")) - (host "192.168.254.254" "ganeti.example.com"))) + ;; In addition, the cluster name must resolve to an IP address that + ;; is not currently provisioned. + (simple-service 'ganeti-host-entries hosts-service-type + (list + (host "10.0.2.15" "gnt1.example.com" '("gnt1")) + (host "192.168.254.254" "ganeti.example.com"))) - (service ganeti-service-type - (ganeti-configuration - (file-storage-paths '("/srv/ganeti/file-storage")) - (rapi-configuration - (ganeti-rapi-configuration - ;; Disable TLS so we can test the RAPI without - ;; pulling in GnuTLS. - (ssl? #f))) - (os %default-ganeti-os)))) - %base-services)))) + (service ganeti-service-type + (ganeti-configuration + (file-storage-paths '("/srv/ganeti/file-storage")) + (rapi-configuration + (ganeti-rapi-configuration + ;; Disable TLS so we can test the RAPI without + ;; pulling in GnuTLS. + (ssl? #f))) + (os %default-ganeti-os)))) + %base-services))))) (define* (run-ganeti-test hypervisor #:key (master-netdev "eth0")