[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
292/376: Add a test for the binary tarball installer
From: |
Ludovic Courtès |
Subject: |
292/376: Add a test for the binary tarball installer |
Date: |
Wed, 28 Jan 2015 22:05:42 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 5d064e2698506be601fd87a20fcfe975b879a1fe
Author: Eelco Dolstra <address@hidden>
Date: Tue Nov 18 14:49:42 2014 +0100
Add a test for the binary tarball installer
---
release.nix | 24 ++++++++++++++++++++----
scripts/install-nix-from-closure.sh | 6 ++++--
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/release.nix b/release.nix
index 5819d4e..a44b0d7 100644
--- a/release.nix
+++ b/release.nix
@@ -211,14 +211,29 @@ let
# System tests.
- tests.remote_builds = (import ./tests/remote-builds.nix rec {
+ tests.remoteBuilds = (import ./tests/remote-builds.nix rec {
nix = build.x86_64-linux; system = "x86_64-linux";
});
- tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
+ tests.nix-copy-closure = (import ./tests/nix-copy-closure.nix rec {
nix = build.x86_64-linux; system = "x86_64-linux";
});
+ tests.binaryTarball =
+ with import <nixpkgs> { system = "x86_64-linux"; };
+ vmTools.runInLinuxImage (runCommand "nix-binary-tarball-test"
+ { diskImage = vmTools.diskImages.ubuntu1204x86_64;
+ }
+ ''
+ useradd -m alice
+ su - alice -c 'tar xf ${binaryTarball.x86_64-linux}/*.tar.*'
+ mount -t tmpfs none /nix # Provide a writable /nix.
+ chown alice /nix
+ su - alice -c '_NIX_INSTALLER_TEST=1 ./nix-*/install'
+ su - alice -c 'nix-store --verify'
+ su - alice -c 'nix-store -qR ${build.x86_64-linux}'
+ ''); # */
+
# Aggregate job containing the release-critical jobs.
release = pkgs.releaseTools.aggregate {
@@ -248,8 +263,9 @@ let
rpm_fedora19x86_64
rpm_fedora20i386
rpm_fedora20x86_64
- tests.remote_builds
- tests.nix_copy_closure
+ tests.remoteBuilds
+ tests.nix-copy-closure
+ tests.binaryTarball
];
};
diff --git a/scripts/install-nix-from-closure.sh
b/scripts/install-nix-from-closure.sh
index ef56149..60ec1ea 100644
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -17,7 +17,7 @@ if [ -z "$USER" ]; then
fi
if [ "$(id -u)" -eq 0 ]; then
- echo "warning: installing Nix as root is not recommended" >&2
+ printf '\e[1;31mwarning: installing Nix as root is not supported by this
script!\e[0m\n'
fi
echo "performing a single-user installation of Nix..." >&2
@@ -79,7 +79,9 @@ if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
$nix/bin/nix-channel --add http://nixos.org/channels/nixpkgs-unstable
fi
fi
-$nix/bin/nix-channel --update nixpkgs
+if [ -z "$_NIX_INSTALLER_TEST" ]; then
+ $nix/bin/nix-channel --update nixpkgs
+fi
# Install an SSL certificate bundle.
$nix/bin/nix-env -iA nixpkgs.cacert || true
- 248/376: Improved error message when encountering unsupported file types, (continued)
- 248/376: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/01/28
- 295/376: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/01/28
- 242/376: Add primop ‘attrValues’, Ludovic Courtès, 2015/01/28
- 254/376: nix-store -q: Check for conflicting flags, Ludovic Courtès, 2015/01/28
- 265/376: Merge pull request #380 from shlevy/temp-disable-darwin, Ludovic Courtès, 2015/01/28
- 253/376: nix-channel: Add --rollback flag, Ludovic Courtès, 2015/01/28
- 289/376: Document functors, Ludovic Courtès, 2015/01/28
- 259/376: Export realiseContext in libnixexpr, Ludovic Courtès, 2015/01/28
- 284/376: SSH.pm: Print a friendlier message if connecting fails, Ludovic Courtès, 2015/01/28
- 278/376: Typo, Ludovic Courtès, 2015/01/28
- 292/376: Add a test for the binary tarball installer,
Ludovic Courtès <=
- 296/376: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/01/28
- 298/376: Fix bad operator, Ludovic Courtès, 2015/01/28
- 270/376: Revert "Temporarily disable darwin builds while hydra's darwin is borked", Ludovic Courtès, 2015/01/28
- 283/376: Doh, Ludovic Courtès, 2015/01/28
- 300/376: import derivation: cleanup, Ludovic Courtès, 2015/01/28
- 264/376: Temporarily disable darwin builds while hydra's darwin is borked, Ludovic Courtès, 2015/01/28
- 291/376: Fix message, Ludovic Courtès, 2015/01/28
- 273/376: Fix more warnings, Ludovic Courtès, 2015/01/28
- 258/376: Fix nix-copy-closure --from, Ludovic Courtès, 2015/01/28
- 260/376: Drop support for pre-c++11 compilers., Ludovic Courtès, 2015/01/28