grahamc/hydra2 - Change 2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC

hydra-queue-runner: Support running in a NixOS container

In a NixOS container, cmdBuildDerivation doesn't work because we're not privileged. But we also don't need it because the store already has the derivation.

Also, don't copy from/to the store since this gives errors about missing signatures.

Created by Eelco Dolstra on September 25, 2019

2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/build-remote.cc at line 51 [6.85]
B:BD[5.297] → [4.21:68]
```
        if (machine->sshName == "localhost") {
```
[5.297]
[4.68]
```
        if (machine->isLocalhost()) {
```

Replacement in src/hydra-queue-runner/build-remote.cc at line 193 [6.85]

B:BD[7.917] → [7.917:973]

            if (GET_PROTOCOL_MINOR(remoteVersion) >= 1)

[7.917]

[7.973]

            // Always send the derivation to localhost, since it's a
            // no-op anyway but we might not be privileged to use
            // cmdBuildDerivation (e.g. if we're running in a NixOS
            // container).
            if (GET_PROTOCOL_MINOR(remoteVersion) >= 1 && !machine->isLocalhost())

Replacement in src/hydra-queue-runner/build-remote.cc at line 243 [6.85]

B:BD[7.2491] → [2.0:100]

        copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, NoRepair, NoCheckSigs);

[7.2491]

[6.3876]

        if (localStore != std::shared_ptr<Store>(destStore))
            copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, NoRepair, NoCheckSigs);

Replacement in src/hydra-queue-runner/build-remote.cc at line 247 [6.85]
B:BD[7.2581] → [7.2581:2639]
```
        if (/* machine->sshName != "localhost" */ true) {
```
[7.2581]
[8.0]
```
        if (!machine->isLocalhost()) {
```

Replacement in src/hydra-queue-runner/build-remote.cc at line 389 [6.85]

B:BD[7.7000] → [7.7000:7058]

        if (/* machine->sshName != "localhost" */ true) {

[7.7000]

[3.356]

        result.accessor = destStore->getFSAccessor();
        if (!machine->isLocalhost() || localStore != std::shared_ptr<Store>(destStore)) {

Deletion in src/hydra-queue-runner/build-remote.cc at line 436 [6.85]
∅:D[7.8736] → [9.678:679]
B:BD[9.678] → [9.678:679]
B:BD[9.679] → [7.8737:8795]
```
            result.accessor = destStore->getFSAccessor();
```

Insertion in src/hydra-queue-runner/state.hh at line 277 [10.1128]

[10.4328]


    bool isLocalhost()
    {
        return sshName == "localhost";
    }