diff options
author | Patryk Wychowaniec <wychowaniec.patryk@gmail.com> | 2020-09-09 17:25:27 +0200 |
---|---|---|
committer | Patryk Wychowaniec <wychowaniec.patryk@gmail.com> | 2020-09-09 19:30:02 +0200 |
commit | 04111cb35689939bfd782243e2f92d873f25db5b (patch) | |
tree | 4397eb4f0943e0a5f1ee97e328e39d8229651064 /nixos | |
parent | 341eeebad652be46f67d5839a0ffd3d60ac34b5e (diff) | |
download | nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar.gz nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar.bz2 nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar.lz nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar.xz nixlib-04111cb35689939bfd782243e2f92d873f25db5b.tar.zst nixlib-04111cb35689939bfd782243e2f92d873f25db5b.zip |
lxd: use stable URL for Alpine's image
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/lxd-nftables.nix | 1 | ||||
-rw-r--r-- | 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 25517914db85..4ca02067a0ae 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 db2d44dff557..bf81fdd3edf1 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` |