max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11832 from DeterminateSystems/fix-remote-build-test

Browse source 
Fix tests.remoteBuilds_local_nix_2_18
This commit is contained in:
Eelco Dolstra 2024-11-07 22:56:28 +01:00 committed by GitHub
commit 723fdeb4f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/nixos/remote-builds.nix
View file

@ -34,6 +34,8 @@ let
} }
''; '';
supportsBadShell = lib.versionAtLeast config.nodes.client.nix.package.version "2.25pre";
in in
{ {
@ -82,7 +84,7 @@ in
nix.settings.substituters = lib.mkForce [ ]; nix.settings.substituters = lib.mkForce [ ];
programs.ssh.extraConfig = "ConnectTimeout 30"; programs.ssh.extraConfig = "ConnectTimeout 30";
environment.systemPackages = [ environment.systemPackages = [
# `bad-shell` is used to make sure Nix works an environment with a misbehaving shell. # `bad-shell` is used to make sure Nix works in an environment with a misbehaving shell.
# #
# More realistically, a bad shell would still run the command ("echo started") # More realistically, a bad shell would still run the command ("echo started")
# but considering that our solution is to avoid this shell (set via $SHELL), we # but considering that our solution is to avoid this shell (set via $SHELL), we
@ -125,13 +127,15 @@ in
'echo hello world on $(hostname)' >&2 'echo hello world on $(hostname)' >&2
""") """)
${lib.optionalString supportsBadShell ''
# Check that SSH uses SHELL for LocalCommand, as expected, and check that # Check that SSH uses SHELL for LocalCommand, as expected, and check that
# our test setup here is working. The next test will use this bad SHELL. # our test setup here is working. The next test will use this bad SHELL.
client.succeed(f"SHELL=$(which bad-shell) ssh -oLocalCommand='true' -oPermitLocalCommand=yes {builder1.name} 'echo hello world' | grep -F 'Hello, I am a broken shell'") client.succeed(f"SHELL=$(which bad-shell) ssh -oLocalCommand='true' -oPermitLocalCommand=yes {builder1.name} 'echo hello world' | grep -F 'Hello, I am a broken shell'")
''}
# Perform a build and check that it was performed on the builder. # Perform a build and check that it was performed on the builder.
out = client.succeed( out = client.succeed(
"SHELL=$(which bad-shell) nix-build ${expr nodes.client 1} 2> build-output", "${lib.optionalString supportsBadShell "SHELL=$(which bad-shell)"} nix-build ${expr nodes.client 1} 2> build-output",
"grep -q Hello build-output" "grep -q Hello build-output"
) )
builder1.succeed(f"test -e {out}") builder1.succeed(f"test -e {out}")