nixos/release-small: remove minimal installer ISOs (#338433)

NixOS · Sep 6, 2024 · 1a2bbb2 · 1a2bbb2
2 parents 365754b + 862911f
commit 1a2bbb2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -407,6 +407,9 @@
 
 - The NixOS installation media no longer support the ReiserFS or JFS file systems by default.
 
+- Minimal installer ISOs are no longer built on the small channel.
+  Please obtain installer images from the full release channels.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
@@ -86,6 +86,7 @@ in rec {
         # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321
         # (onSystems ["x86_64-linux"] "nixos.tests.hibernate")
         (onFullSupported "nixos.tests.i3wm")
+        (onSystems ["aarch64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot")
         (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")
         (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault")
         (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape")

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
@@ -53,12 +53,8 @@ in rec {
         inherit (nixos'.tests.installer)
           lvm
           separateBoot
-          simple;
-      };
-      boot = {
-        inherit (nixos'.tests.boot)
-          biosCdrom
-          uefiCdrom;
+          simple
+          simpleUefiSystemdBoot;
       };
     };
   };
@@ -107,18 +103,16 @@ in rec {
         "nixpkgs.tarball"
         "nixpkgs.release-checks"
       ]
+      (onSystems [ "aarch64-linux" ] "nixos.tests.installer.simpleUefiSystemdBoot")
       (map (onSystems [ "x86_64-linux" ]) [
-        "nixos.tests.boot.biosCdrom"
         "nixos.tests.installer.lvm"
         "nixos.tests.installer.separateBoot"
         "nixos.tests.installer.simple"
       ])
       (map onSupported [
         "nixos.dummy"
-        "nixos.iso_minimal"
         "nixos.manual"
         "nixos.tests.acme"
-        "nixos.tests.boot.uefiCdrom"
         "nixos.tests.containers-imperative"
         "nixos.tests.containers-ip"
         "nixos.tests.firewall"