From 5266d2da667a62ca38c0375bc62dc53a97e70616 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Fri, 12 Jul 2024 10:01:18 -0300
Subject: [PATCH] k3s/tests/auto-deploy: fix auto-deploy reference

* re-establish alphabetical order
* fix typo on comment
---
 nixos/tests/k3s/default.nix                          | 4 ++--
 pkgs/applications/networking/cluster/k3s/builder.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix
index b8a3ace44f3e..529cf312be7e 100644
--- a/nixos/tests/k3s/default.nix
+++ b/nixos/tests/k3s/default.nix
@@ -7,6 +7,8 @@ let
   allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
 in
 {
+  # Test whether container images are imported and auto deploying manifests work
+  auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;
   # Testing K3s with Etcd backend
   etcd = lib.mapAttrs (
     _: k3s:
@@ -19,6 +21,4 @@ in
   single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;
   # Run a multi-node k3s cluster and verify pod networking works across nodes
   multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s;
-  # Test wether container images are imported and auto deploying manifests work
-  auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;
 }
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 45eaa31e301f..4973b5e67db9 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -419,6 +419,7 @@ buildGoModule rec {
       k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
     in
     {
+      auto-deploy = nixosTests.k3s.auto-deploy.${k3s_version};
       etcd = nixosTests.k3s.etcd.${k3s_version};
       single-node = nixosTests.k3s.single-node.${k3s_version};
       multi-node = nixosTests.k3s.multi-node.${k3s_version};