From 04111cb35689939bfd782243e2f92d873f25db5b Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 17:25:27 +0200 Subject: [PATCH 1/3] lxd: use stable URL for Alpine's image --- nixos/tests/lxd-nftables.nix | 1 + nixos/tests/lxd.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix index 25517914db8..4ca02067a0a 100644 --- a/nixos/tests/lxd-nftables.nix +++ b/nixos/tests/lxd-nftables.nix @@ -7,6 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index db2d44dff55..bf81fdd3edf 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -6,15 +6,14 @@ let # # I've chosen to import Alpine Linux, because its image is turbo-tiny and, # generally, sufficient for our tests. - alpine-meta = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/lxd.tar.xz"; - sha256 = "1hkvaj3rr333zmx1759njy435lps33gl4ks8zfm7m4nqvipm26a0"; + url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; + sha256 = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; }; alpine-rootfs = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/rootfs.tar.xz"; - sha256 = "1v82zdra4j5xwsff09qlp7h5vbsg54s0j7rdg4rynichfid3r347"; + url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; + sha256 = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; }; lxd-config = pkgs.writeText "config.yaml" '' @@ -44,8 +43,10 @@ let type: disk ''; + in { name = "lxd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; @@ -53,7 +54,7 @@ in { machine = { lib, ... }: { virtualisation = { # Since we're testing `limits.cpu`, we've gotta have a known number of - # cores to lay on + # cores to lean on cores = 2; # Ditto, for `limits.memory` From 93b8435915e9bbc8efe0c9c40a1d981cebaa795c Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 19:46:21 +0200 Subject: [PATCH 2/3] lxd: add `wait_for_file()` to ensure LXD is actually running --- nixos/tests/lxd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index bf81fdd3edf..0ee3084f246 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -68,6 +68,7 @@ in { testScript = '' machine.wait_for_unit("sockets.target") machine.wait_for_unit("lxd.service") + machine.wait_for_file("/var/lib/lxd/unix.socket") # It takes additional second for lxd to settle machine.sleep(1) From 183d9abdafbf505f47a4c188ae141aa9a40570f4 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 20:07:17 +0200 Subject: [PATCH 3/3] lxd: s/sha256/hash --- nixos/tests/lxd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index 0ee3084f246..d1e642383cf 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -8,12 +8,12 @@ let # generally, sufficient for our tests. alpine-meta = pkgs.fetchurl { url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; - sha256 = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; + hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; }; alpine-rootfs = pkgs.fetchurl { url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; - sha256 = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; + hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; }; lxd-config = pkgs.writeText "config.yaml" ''