Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test RemoteStore::buildDerivation #3922

Merged

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Aug 12, 2020

Fix wopNarFromPath which needed a toRealPath.

chmod -R u+w $TEST_ROOT/machine1 || true
chmod -R u+w $TEST_ROOT/machine2 || true
rm -rf $TEST_ROOT/machine0 $TEST_ROOT/machine1 $TEST_ROOT/machine2
rm -f $TEST_ROOT/result
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now run init.sh before every test so we don't need this.

builders=(
"ssh://localhost?remote-store=$TEST_ROOT/machine1"
"$TEST_ROOT/machine2 - - 1 1 foo"
"ssh-ng://localhost?remote-store=$TEST_ROOT/machine3?systemFeatures=baz - - 1 1 baz"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?systemFeatures=baz won't work, but it's failing before it even gets that far.

Before, processConnection wanted to know a user name and user id, and
`nix-daemon --stdio`, when it isn't proxying to an underlying daemon,
would just assume "root" and 0. But `nix-daemon --stdio` (no proxying)
shouldn't make guesses about who holds the other end of its standard
streams.

Now processConnection takes an "auth hook", so `nix-daemon` can provide
the appropriate policy and daemon.cc doesn't need to know or care what
it is.
@Ericson2314 Ericson2314 force-pushed the test-RemoteStore-buildDerivation branch from 745419d to 877a1b7 Compare August 12, 2020 17:50
This seems more correct. It also means one can specify the features a
store should support with --store and remote-store=..., which is useful.
I use this to clean up the build remotes test.
@Ericson2314 Ericson2314 force-pushed the test-RemoteStore-buildDerivation branch from 877a1b7 to 5d62fb1 Compare August 12, 2020 18:27
@Ericson2314 Ericson2314 changed the title WIP: Test RemoteStore::buildDerivation WIP: Test RemoteStore::buildDerivation -- contains #3923 & #3924 Aug 12, 2020
Fix `wopNarFromPath` which needed a `toRealPath`.
@Ericson2314 Ericson2314 force-pushed the test-RemoteStore-buildDerivation branch from 5d62fb1 to d2f2be0 Compare August 13, 2020 04:08
@Ericson2314 Ericson2314 changed the title WIP: Test RemoteStore::buildDerivation -- contains #3923 & #3924 Test RemoteStore::buildDerivation -- contains #3923 & #3924 Aug 13, 2020
@Ericson2314 Ericson2314 changed the title Test RemoteStore::buildDerivation -- contains #3923 & #3924 Test RemoteStore::buildDerivation -- contains #3924 Aug 14, 2020
src/libstore/daemon.cc Outdated Show resolved Hide resolved
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
@Ericson2314 Ericson2314 changed the title Test RemoteStore::buildDerivation -- contains #3924 Test RemoteStore::buildDerivation Aug 14, 2020
@Ericson2314
Copy link
Member Author

Oh good, still works.

@edolstra edolstra merged commit 3c619f6 into NixOS:master Aug 17, 2020
@Ericson2314 Ericson2314 deleted the test-RemoteStore-buildDerivation branch August 17, 2020 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants