yvan-sraka/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Repair some tests (#248)

Browse source 
* Repair some tests

* Yank sha256 prefixes
This commit is contained in:
Ana Hobden 2023-02-13 15:33:30 -08:00 committed by GitHub
parent 1b3d441051
commit 1c0c92f35e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -36,7 +36,7 @@
forSystem = system: f: f rec { forSystem = system: f: f rec {
inherit system; inherit system;
pkgs = import nixpkgs { inherit system; overlays = [ self.overlays.default nix.overlays.default ]; }; pkgs = import nixpkgs { inherit system; overlays = [ self.overlays.default ]; };
lib = pkgs.lib; lib = pkgs.lib;
}; };

18
nix/tests/container-test/default.nix
View file

@ -7,9 +7,9 @@ let
# Found via https://hub.docker.com/_/ubuntu/ under "How is the rootfs build?" # Found via https://hub.docker.com/_/ubuntu/ under "How is the rootfs build?"
# Jammy # Jammy
"ubuntu-v22_04" = { "ubuntu-v22_04" = {
tarball = import <nix/fetchurl.nix> { tarball = builtins.fetchurl {
url = "https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/jammy/ubuntu-oci/+build/408115/+files/livecd.ubuntu-oci.rootfs.tar.gz"; url = "http://cdimage.ubuntu.com/ubuntu-base/releases/22.04/release/ubuntu-base-22.04-base-amd64.tar.gz";
hash = "sha256-BirwSM4c+ZV1upU0yV3qa+BW9AvpBUxvZuPTeI9mA8M="; sha256 = "01sbpjb32x1z1yr9q78zrk0a6kfw5c4fxw1jqmm23g8ixryffvyz";
}; };
tester = ./default/Dockerfile; tester = ./default/Dockerfile;
system = "x86_64-linux"; system = "x86_64-linux";
@ -17,9 +17,9 @@ let
# focal # focal
"ubuntu-v20_04" = { "ubuntu-v20_04" = {
tarball = import <nix/fetchurl.nix> { tarball = builtins.fetchurl {
url = "https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/focal/ubuntu-oci/+build/408120/+files/livecd.ubuntu-oci.rootfs.tar.gz"; url = "http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04.1-base-amd64.tar.gz";
hash = "sha256-iTJR+DeC5lT4PMqT/xFAFwmlC/qvslDFccDrVFLt/a8="; sha256 = "0ryn38csmx41a415g9b3wk30csaxxlkgkdij9v4754pk877wpxlp";
}; };
tester = ./default/Dockerfile; tester = ./default/Dockerfile;
system = "x86_64-linux"; system = "x86_64-linux";
@ -27,9 +27,9 @@ let
# bionic # bionic
"ubuntu-v18_04" = { "ubuntu-v18_04" = {
tarball = import <nix/fetchurl.nix> { tarball = builtins.fetchurl {
url = "https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/bionic/ubuntu-oci/+build/408103/+files/livecd.ubuntu-oci.rootfs.tar.gz"; url = "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04.5-base-amd64.tar.gz";
hash = "sha256-gi48yl5laoKLoVCDIORsseOM6DI58FNpAjSVe7OOs7I="; sha256 = "1sh73pqwgyzkyssv3ngpxa2ynnkbdvjpxdw1v9ql4ghjpd3hpwlg";
}; };
tester = ./default/Dockerfile; tester = ./default/Dockerfile;
system = "x86_64-linux"; system = "x86_64-linux";

2
nix/tests/container-test/default/Dockerfile
View file

@ -3,6 +3,6 @@ COPY nix-installer /nix-installer
RUN chmod +x /nix-installer RUN chmod +x /nix-installer
COPY binary-tarball /binary-tarball COPY binary-tarball /binary-tarball
RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz
RUN /nix-installer/bin/nix-installer install linux-multi --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --channel --no-confirm -vvv RUN /nix-installer/bin/nix-installer install linux --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --channel --no-confirm -vvv
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin" ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }' RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }'

4
nix/tests/vm-test/default.nix
View file

@ -22,7 +22,7 @@ let
install-no-start-daemon = { install-no-start-daemon = {
install = '' install = ''
NIX_PATH=$(readlink -f nix.tar.xz) NIX_PATH=$(readlink -f nix.tar.xz)
RUST_BACKTRACE="full" ./nix-installer install linux-multi --no-start-daemon --logger pretty --log-directive nix_installer=trace --channel --nix-package-url "file://$NIX_PATH" --no-confirm RUST_BACKTRACE="full" ./nix-installer install linux --no-start-daemon --logger pretty --log-directive nix_installer=trace --channel --nix-package-url "file://$NIX_PATH" --no-confirm
''; '';
check = '' check = ''
set -ex set -ex
@ -48,7 +48,7 @@ let
install-daemonless = { install-daemonless = {
install = '' install = ''
NIX_PATH=$(readlink -f nix.tar.xz) NIX_PATH=$(readlink -f nix.tar.xz)
RUST_BACKTRACE="full" ./nix-installer install linux-multi --init none --logger pretty --log-directive nix_installer=trace --channel --nix-package-url "file://$NIX_PATH" --no-confirm RUST_BACKTRACE="full" ./nix-installer install linux --init none --logger pretty --log-directive nix_installer=trace --channel --nix-package-url "file://$NIX_PATH" --no-confirm
''; '';
check = '' check = ''
set -ex set -ex