From 448b9932dfbcc88cb58481240fc739b5793158fc Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Mon, 16 Dec 2024 15:43:53 +0100
Subject: [PATCH] nixos/tests/ec2: remove ec2-config test

It has been broken for as long as I know
---
 nixos/tests/all-tests.nix |  3 +-
 nixos/tests/ec2.nix       | 71 +--------------------------------------
 2 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1eed27e00a54..d43b601b5dee 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -489,9 +489,8 @@ in
   early-mount-options = runTest ./early-mount-options.nix;
   earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
   easytier = runTest ./easytier.nix;
-  ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
   ec2-image = runTest ./ec2-image.nix;
-  ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
+  ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).ec2-nixops or { };
   echoip = runTest ./echoip.nix;
   ejabberd = runTest ./xmpp/ejabberd.nix;
   elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index ae9a79db5403..e38057e6d8ae 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -31,30 +31,6 @@ let
           # the configuration in virtualisation/amazon-image.nix.
           systemd.services."serial-getty@ttyS0".enable = mkForce false;
 
-          # Needed by nixos-rebuild due to the lack of network
-          # access. Determined by trial and error.
-          system.extraDependencies = with pkgs; [
-            # Needed for a nixos-rebuild.
-            busybox
-            cloud-utils
-            desktop-file-utils
-            libxslt.bin
-            mkinitcpio-nfs-utils
-            stdenv
-            stdenvNoCC
-            texinfo
-            unionfs-fuse
-            lndir
-
-            # These are used in the configure-from-userdata tests
-            # for EC2. Httpd and valgrind are requested by the
-            # configuration.
-            apacheHttpd
-            apacheHttpd.doc
-            apacheHttpd.man
-            valgrind.doc
-          ];
-
           nixpkgs.pkgs = pkgs;
         }
       ];
@@ -68,7 +44,7 @@ let
 
 in
 {
-  boot-ec2-nixops = makeEc2Test {
+  ec2-nixops = makeEc2Test {
     name = "nixops-userdata";
     meta.timeout = 600;
     inherit image;
@@ -116,49 +92,4 @@ in
       machine.wait_for_file("/etc/ec2-metadata/user-data")
     '';
   };
-
-  boot-ec2-config = makeEc2Test {
-    name = "config-userdata";
-    meta.broken = true; # amazon-init wants to download from the internet while building the system
-    inherit image;
-    sshPublicKey = snakeOilPublicKey;
-
-    # ### https://channels.nixos.org/nixos-unstable nixos
-    userData = ''
-      { pkgs, ... }:
-
-      {
-        imports = [
-          <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
-          <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
-          <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-        ];
-        environment.etc.testFile = {
-          text = "whoa";
-        };
-
-        networking.hostName = "ec2-test-vm"; # required by services.httpd
-
-        services.httpd = {
-          enable = true;
-          adminAddr = "test@example.org";
-          virtualHosts.localhost.documentRoot = "''${pkgs.valgrind.doc}/share/doc/valgrind/html";
-        };
-        networking.firewall.allowedTCPPorts = [ 80 ];
-      }
-    '';
-    script = ''
-      machine.start()
-
-      # amazon-init must succeed. if it fails, make the test fail
-      # immediately instead of timing out in wait_for_file.
-      machine.wait_for_unit("amazon-init.service")
-
-      machine.wait_for_file("/etc/testFile")
-      assert "whoa" in machine.succeed("cat /etc/testFile")
-
-      machine.wait_for_unit("httpd.service")
-      assert "Valgrind" in machine.succeed("curl http://localhost")
-    '';
-  };
 }