Unverified Commit 90a93f92 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 92d53105 8a4836de

maintainers/maintainer-list.nix

+13 −0
Original line number Diff line number Diff line
@@ -4988,6 +4988,12 @@ 
    githubId = 62989;

    name = "Demyan Rogozhin";

  };

  denperidge = {

    email = "contact@denperidge.com";

    github = "denperidge";

    githubId = 27348469;

    name = "Cat";

  };

  derchris = {

    email = "derchris@me.com";

    github = "derchrisuk";
@@ -19386,6 +19392,13 @@ 
    githubId = 158321;

    name = "Stewart Mackenzie";

  };

  skeuchel = {

    name = "Steven Keuchel";

    email = "steven.keuchel@gmail.com";

    github = "skeuchel";

    githubId = 617130;

    keys = [ { fingerprint = "C4F7 46C7 B560 38D8 210F  0288 5877 DEE9 7428 557F"; } ];

  };

  skovati = {

    github = "skovati";

    githubId = 49844593;

nixos/modules/testing/test-instrumentation.nix

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ in 


    boot.kernelParams = [

      "console=${qemu-common.qemuSerialDevice}"

      "console=tty0"

      # Panic if an error occurs in stage 1 (rather than waiting for

      # user intervention).

      "panic=1" "boot.panic_on_fail"
@@ -180,6 +181,7 @@ in 
    services.journald.extraConfig =

      ''

        ForwardToConsole=yes

        TTYPath=/dev/${qemu-common.qemuSerialDevice}

        MaxLevelConsole=debug

      '';

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -444,7 +444,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 {};

nixos/tests/hocker-fetchdocker/default.nix

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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")

  '';

})

nixos/tests/hocker-fetchdocker/hello-world-container.nix

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
{ 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 ];

  }