Merge branch 'master' into staging

2 files changed, 43 insertions, 7 deletions

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 <ludo@gnu.org>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
 ;;;
 ;;; 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))
 
 
 ;;;
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 <dannym@scratchpost.org>
-;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; 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 '())))