delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1321 from NixOS/master

Browse source 
Mere `master` into `nix-next`
This commit is contained in:
John Ericson 2023-12-09 11:53:58 -05:00 committed by GitHub
parent 20c8263e3c 411e4d0c24
commit 4515b5aa17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/hydra-queue-runner/build-remote.cc
View file

@ -286,9 +286,6 @@ static BuildResult performBuild(
counter & nrStepsBuilding counter & nrStepsBuilding
) )
{ {
BuildResult result;
conn.to << ServeProto::Command::BuildDerivation << localStore.printStorePath(drvPath); conn.to << ServeProto::Command::BuildDerivation << localStore.printStorePath(drvPath);
writeDerivation(conn.to, localStore, drv); writeDerivation(conn.to, localStore, drv);
conn.to << options.maxSilentTime << options.buildTimeout; conn.to << options.maxSilentTime << options.buildTimeout;
@ -301,30 +298,25 @@ static BuildResult performBuild(
} }
conn.to.flush(); conn.to.flush();
result.startTime = time(0); BuildResult result;
time_t startTime, stopTime;
startTime = time(0);
{ {
MaintainCount<counter> mc(nrStepsBuilding); MaintainCount<counter> mc(nrStepsBuilding);
result.status = (BuildResult::Status)readInt(conn.from); result = ServeProto::Serialise<BuildResult>::read(localStore, conn);
} }
result.stopTime = time(0); stopTime = time(0);
if (!result.startTime) {
result.errorMsg = readString(conn.from); // If the builder gave `startTime = 0`, use our measurements
if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 3) { // instead of the builder's.
result.timesBuilt = readInt(conn.from); //
result.isNonDeterministic = readInt(conn.from); // Note: this represents the duration of a single round, rather
auto start = readInt(conn.from); // than all rounds.
auto stop = readInt(conn.from); result.startTime = startTime;
if (start && start) { result.stopTime = stopTime;
/* Note: this represents the duration of a single
round, rather than all rounds. */
result.startTime = start;
result.stopTime = stop;
}
}
if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 6) {
ServeProto::Serialise<DrvOutputs>::read(localStore, conn);
} }
return result; return result;

4
t/lib/HydraTestContext.pm
View file

@ -39,7 +39,9 @@ use Hydra::Helper::Exec;
sub new { sub new {
my ($class, %opts) = @_; my ($class, %opts) = @_;
my $dir = File::Temp->newdir(); # Cleanup will be managed by yath. By the default it will be cleaned
# up, but can be kept to aid in debugging test failures.
my $dir = File::Temp->newdir(CLEANUP => 0);
$ENV{'HYDRA_DATA'} = "$dir/hydra-data"; $ENV{'HYDRA_DATA'} = "$dir/hydra-data";
mkdir $ENV{'HYDRA_DATA'}; mkdir $ENV{'HYDRA_DATA'};