civodul pushed a commit to branch master
in repository guix.
commit 30a5ada6beb2c57d803b992af583ab42e2a9b523
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Sat Mar 15 21:48:25 2025 +0100
tests: ganeti: Write system log to /dev/console.
* gnu/tests/ganeti.scm (%ganeti-os): Wrap in
‘operating-system-with-console-syslog’.
Reviewed-by: Maxim Cournoyer <maxim.courno...@gmail.com>
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 @@
#: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")
