grahamc/hydra2 - Change EJJCY263UXP4F2NAHOARQRBV2V2Z7MK7474RFNOD6LDYTCPMWIPQC

Account steps with preferLocalBuild as a separate system type

They will show up in machineTypes as (e.g.) x86_64-linux:local instead of x86_64-linux. This is to prevent the Hydra provisioner from creating machines for steps that are supposed to be executed locally.

Created by Eelco Dolstra on September 2, 2015

EJJCY263UXP4F2NAHOARQRBV2V2Z7MK7474RFNOD6LDYTCPMWIPQC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 335 [3.20067]

[3.31444]

[2.296]


    auto attr = step->drv.env.find("preferLocalBuild");
    step->preferLocalBuild =
        attr != step->drv.env.end() && attr->second == "1"
        && has(localPlatforms, step->drv.platform);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 344 [3.20067]

B:BD[3.31513] → [2.340:380]

∅:D[2.380] → [3.31551:31644]

B:BD[3.31551] → [3.31551:31644]

        if (i != step->drv.env.end()) {
            step->requiredSystemFeatures = tokenizeString<std::set<std::string>>(i->second);

[3.31513]

[2.381]

        StringSet features;
        if (i != step->drv.env.end())
            features = step->requiredSystemFeatures = tokenizeString<std::set<std::string>>(i->second);
        if (step->preferLocalBuild)
            features.insert("local");
        if (!features.empty()) {

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 351 [3.20067]

B:BD[2.418] → [2.418:503]

            step->systemType += concatStringsSep(",", step->requiredSystemFeatures);

[2.418]

[2.503]

            step->systemType += concatStringsSep(",", features);

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 355 [3.20067]

B:BD[3.31651] → [3.31651:31848]

    auto attr = step->drv.env.find("preferLocalBuild");
    step->preferLocalBuild =
        attr != step->drv.env.end() && attr->second == "1"
        && has(localPlatforms, step->drv.platform);