From a742480e9f9d825f60986b1bce8f7d9ebffb7888 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 25 Jun 2026 14:31:22 +0200
Subject: [PATCH] maintainers/test-driver: make maintainer-team github-based
 and add owners, rename from 'tests'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renaming from `tests` to make it explicit that we're maintaining the
driver and not all tests.

As briefly discussed with Jacek & Kierán.
We rely on pinging each other / being pinged and that seems better.
---
 ci/OWNERS                 | 10 ++++++----
 maintainers/team-list.nix |  6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index cab7f55f947c..c3e587c33c12 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -127,10 +127,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 /doc/redirects.json                @GetPsyched
 /nixos/doc/manual/redirects.json   @GetPsyched
 
-# NixOS integration test driver
-/nixos/lib/test-driver  @tfc
-/nixos/lib/testing      @tfc
-
 # NixOS QEMU virtualisation
 /nixos/modules/virtualisation/qemu-vm.nix                 @raitobezarius
 /nixos/modules/services/backup/libvirtd-autosnapshot.nix  @6543
@@ -531,3 +527,9 @@ pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @FlameFlag @johnrtitor
 
 # Zellij plugins
 /pkgs/by-name/ze/zellij/plugins/   @PerchunPak
+
+# Test-driver
+/nixos/lib/test-driver                                      @NixOS/test-driver
+/nixos/lib/testing                                          @NixOS/test-driver
+/nixos/tests/nixos-test-driver                              @NixOS/test-driver
+/nixos/modules/virtualisation/nspawn-container/run-nspawn   @NixOS/test-driver
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1480b3733b92..382645fe88db 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -748,10 +748,8 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  tests = {
-    members = [ tfc ];
-    scope = "Maintain the NixOS VM test runner.";
-    shortName = "NixOS tests";
+  test-driver = {
+    github = "test-driver";
     enableFeatureFreezePing = true;
   };