From 2493de0d1a481f079580a354430b26977afbdbd1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 5 Dec 2022 10:51:25 -0500 Subject: Revert "tests: install: Fix iso-image-installer test." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0f66ef9aa99d2043abccbc80d858bdeca57534ac. e2fsprogs is now included in the installation operating system since 34f69bc6e6ea555929ecca83ee7592f5261ff5f2, making this workaround obsolete. Suggested-by: Ludovic Courtès --- gnu/tests/install.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 30a9026d5f..4e0e274e66 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -471,8 +471,6 @@ reboot\n") (mlet* %store-monad ((images (run-install %minimal-os-on-vda %minimal-os-on-vda-source - #:packages - (list e2fsprogs) #:script %simple-installation-script-for-/dev/vda #:installation-image-type -- cgit v1.3 From 6232959311b5717c19552e1116f6e4fea9797282 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Dec 2022 15:10:24 +0100 Subject: tests: docker-system: Increase image size. * gnu/tests/docker.scm (run-docker-system-test)[vm]: Increase 'disk-image-size'. --- gnu/tests/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 3e780d8a60..4267ff89a8 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic -;;; Copyright © 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2019-2022 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -209,7 +209,7 @@ inside %DOCKER-OS." (virtual-machine (operating-system os) (volatile? #f) - (disk-image-size (* 5000 (expt 2 20))) + (disk-image-size (* 5500 (expt 2 20))) (memory-size 2048) (port-forwardings '()))) -- cgit v1.3 From 2c1b488d19831702288b8bdee4cecf661da91b60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 7 Feb 2022 23:14:04 +0100 Subject: tests: Add system tests for each supported kernel version. * gnu/tests/base.scm (%test-basic-os): Rename to ... (test-basic-os): ... this, and turn into procedure that takes optional KERNEL argument. (%test-basic-os): Use that procedure. (%test-linux-libre-5.15, %test-linux-libre-5.10, %test-linux-libre-5.4, %test-linux-libre-4.19, %test-linux-libre-4.14, %test-linux-libre-4.9): New tests. --- gnu/tests/base.scm | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index fe7ca35f60..844039f5f8 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,10 +47,17 @@ #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix packages) + #:use-module (guix utils) #:use-module ((srfi srfi-1) #:hide (partition)) #:use-module (ice-9 match) #:export (run-basic-test %test-basic-os + %test-linux-libre-5.15 + %test-linux-libre-5.10 + %test-linux-libre-5.4 + %test-linux-libre-4.19 + %test-linux-libre-4.14 + %test-linux-libre-4.9 %test-halt %test-root-unmount %test-cleanup @@ -533,15 +541,20 @@ info --version") (gexp->derivation name test)) -(define %test-basic-os +(define* (test-basic-os #:optional (kernel linux-libre)) (system-test - (name "basic") + (name (if (eq? kernel linux-libre) + "basic" + (string-append (package-name kernel) "-" + (version-major+minor (package-version kernel))))) (description "Instrument %SIMPLE-OS, run it in a VM, and run a series of basic -functionality tests.") +functionality tests, using the given KERNEL.") (value (let* ((os (marionette-operating-system - %simple-os + (operating-system + (inherit %simple-os) + (kernel kernel)) #:imported-modules '((gnu services herd) (guix combinators)))) (vm (virtual-machine os))) @@ -549,7 +562,30 @@ functionality tests.") ;; set of services as the OS produced by ;; 'system-qemu-image/shared-store-script'. (run-basic-test (virtualized-operating-system os '()) - #~(list #$vm)))))) + #~(list #$vm) + name))))) + +(define %test-basic-os + (test-basic-os)) + +;; Ensure the LTS kernels are up to snuff, too. +(define %test-linux-libre-5.15 + (test-basic-os linux-libre-5.15)) + +(define %test-linux-libre-5.10 + (test-basic-os linux-libre-5.10)) + +(define %test-linux-libre-5.4 + (test-basic-os linux-libre-5.4)) + +(define %test-linux-libre-4.19 + (test-basic-os linux-libre-4.19)) + +(define %test-linux-libre-4.14 + (test-basic-os linux-libre-4.14)) + +(define %test-linux-libre-4.9 + (test-basic-os linux-libre-4.9)) ;;; -- cgit v1.3