diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8a8cd838ce5d..ec7d5d52f7af 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -427,7 +427,6 @@ in { hibernate-systemd-stage-1 = handleTestOn ["x86_64-linux"] ./hibernate.nix { systemdStage1 = true; }; hitch = handleTest ./hitch {}; hledger-web = handleTest ./hledger-web.nix {}; - hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; hockeypuck = handleTest ./hockeypuck.nix { }; home-assistant = handleTest ./home-assistant.nix {}; hostname = handleTest ./hostname.nix {}; diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix deleted file mode 100644 index b5c06126c2e8..000000000000 --- a/nixos/tests/hocker-fetchdocker/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -import ../make-test-python.nix ({ pkgs, ...} : { - name = "test-hocker-fetchdocker"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ixmatus ]; - broken = true; # tries to download from registry-1.docker.io - how did this ever work? - }; - - nodes.machine = import ./machine.nix; - - testScript = '' - start_all() - - machine.wait_for_unit("sockets.target") - machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest") - ''; -}) diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix deleted file mode 100644 index a127875264e9..000000000000 --- a/nixos/tests/hocker-fetchdocker/hello-world-container.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchDockerConfig, fetchDockerLayer, fetchdocker }: -fetchdocker rec { - name = "hello-world"; - registry = "https://registry-1.docker.io/v2/"; - repository = "library"; - imageName = "hello-world"; - tag = "latest"; - imageConfig = fetchDockerConfig { - inherit tag registry repository imageName; - sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj"; - }; - imageLayers = let - layer0 = fetchDockerLayer { - inherit registry repository imageName; - layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede"; - sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya"; - }; - in [ layer0 ]; - } diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix deleted file mode 100644 index 885adebe1498..000000000000 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: -{ nixpkgs.config.packageOverrides = pkgs': { - hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; - }; - - virtualisation.docker = { - enable = true; - package = pkgs.docker; - }; - - systemd.services.docker-load-fetchdocker-image = { - description = "Docker load hello-world-container"; - wantedBy = [ "multi-user.target" ]; - wants = [ "docker.service" ]; - after = [ "docker.service" ]; - - script = '' - ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load - ''; - - serviceConfig = { - Type = "oneshot"; - }; - }; -} -