From fc5ba002ad6f7fe00c0ded1289b9522b0ce608ce Mon Sep 17 00:00:00 2001 From: benaryorg Date: Tue, 25 Aug 2026 03:20:20 +0000 Subject: [PATCH] ceph.tests: latest linux kernel This is required for the tests to pass since the `aes256k` cipher (the secure one) is only available since version 7.0. Signed-off-by: benaryorg (cherry picked from commit 2888c1ab837dcc3cd35a4054772ea3c4f5b559f1) --- nixos/tests/ceph-multi-node-bluestore.nix | 5 +++++ nixos/tests/ceph-multi-node-deprecated-filestore.nix | 5 +++++ nixos/tests/ceph-single-node-bluestore-dmcrypt.nix | 5 +++++ nixos/tests/ceph-single-node-bluestore.nix | 5 +++++ nixos/tests/ceph-single-node-deprecated-filestore.nix | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/nixos/tests/ceph-multi-node-bluestore.nix b/nixos/tests/ceph-multi-node-bluestore.nix index 96fefca78230..a4e7b8fd047a 100644 --- a/nixos/tests/ceph-multi-node-bluestore.nix +++ b/nixos/tests/ceph-multi-node-bluestore.nix @@ -209,6 +209,11 @@ let vlans = [ 1 ]; }; + # Ceph 20.2.4 introduced the aes256k cipher for authentication. + # Linux started supporting these in kernel version 7.0. + # Remove this line at the earliest convenience (i.e. when tests are run by 7.0 or higher by default). + boot.kernelPackages = pkgs.linuxPackages_latest; + networking = networkConfig; environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/ceph-multi-node-deprecated-filestore.nix b/nixos/tests/ceph-multi-node-deprecated-filestore.nix index 992a74f72972..f0705dece1ae 100644 --- a/nixos/tests/ceph-multi-node-deprecated-filestore.nix +++ b/nixos/tests/ceph-multi-node-deprecated-filestore.nix @@ -47,6 +47,11 @@ let vlans = [ 1 ]; }; + # Ceph 20.2.4 introduced the aes256k cipher for authentication. + # Linux started supporting these in kernel version 7.0. + # Remove this line at the earliest convenience (i.e. when tests are run by 7.0 or higher by default). + boot.kernelPackages = pkgs.linuxPackages_latest; + networking = networkConfig; environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix b/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix index 8ab8cbba3a62..a5782abbc7c8 100644 --- a/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix +++ b/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix @@ -34,6 +34,11 @@ in 20480 ]; + # Ceph 20.2.4 introduced the aes256k cipher for authentication. + # Linux started supporting these in kernel version 7.0. + # Remove this line at the earliest convenience (i.e. when tests are run by 7.0 or higher by default). + boot.kernelPackages = pkgs.linuxPackages_latest; + # networking setup (no external connectivity required, only local IPv6) networking.useDHCP = false; systemd.network = { diff --git a/nixos/tests/ceph-single-node-bluestore.nix b/nixos/tests/ceph-single-node-bluestore.nix index 5e84695ac4be..fac0b797683b 100644 --- a/nixos/tests/ceph-single-node-bluestore.nix +++ b/nixos/tests/ceph-single-node-bluestore.nix @@ -48,6 +48,11 @@ let vlans = [ 1 ]; }; + # Ceph 20.2.4 introduced the aes256k cipher for authentication. + # Linux started supporting these in kernel version 7.0. + # Remove this line at the earliest convenience (i.e. when tests are run by 7.0 or higher by default). + boot.kernelPackages = pkgs.linuxPackages_latest; + networking = networkConfig; environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/ceph-single-node-deprecated-filestore.nix b/nixos/tests/ceph-single-node-deprecated-filestore.nix index c08238559155..908760bebfd8 100644 --- a/nixos/tests/ceph-single-node-deprecated-filestore.nix +++ b/nixos/tests/ceph-single-node-deprecated-filestore.nix @@ -52,6 +52,11 @@ let vlans = [ 1 ]; }; + # Ceph 20.2.4 introduced the aes256k cipher for authentication. + # Linux started supporting these in kernel version 7.0. + # Remove this line at the earliest convenience (i.e. when tests are run by 7.0 or higher by default). + boot.kernelPackages = pkgs.linuxPackages_latest; + networking = networkConfig; environment.systemPackages = with pkgs; [