lix-project/hydra
2
0
Fork 5
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1110 from DeterminateSystems/project-jobset/api-buildToHash

Browse source 
Project jobset: api: update endpoints to stop using build.{project,jobset}
This commit is contained in:
Graham Christensen 2022-01-14 15:27:13 -05:00 committed by GitHub
parent 95eb14591f a81e358016
commit cc8104fa46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 251 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/lib/Hydra/Controller/API.pm
View file

@ -24,8 +24,8 @@ sub buildToHash {
my ($build) = @_;
my $result = {
id => $build->id,
project => $build->get_column("project"),
jobset => $build->get_column("jobset"),
project => $build->jobset->get_column("project"),
jobset => $build->jobset->get_column("name"),
job => $build->get_column("job"),
system => $build->system,
nixname => $build->nixname,
@ -54,12 +54,18 @@ sub latestbuilds : Chained('api') PathPart('latestbuilds') Args(0) {
my $system = $c->request->params->{system};
my $filter = {finished => 1};
$filter->{project} = $project if ! $project eq "";
$filter->{jobset} = $jobset if ! $jobset eq "";
$filter->{"jobset.project"} = $project if ! $project eq "";
$filter->{"jobset.name"} = $jobset if ! $jobset eq "";
$filter->{job} = $job if !$job eq "";
$filter->{system} = $system if !$system eq "";
my @latest = $c->model('DB::Builds')->search($filter, {rows => $nr, order_by => ["id DESC"] });
my @latest = $c->model('DB::Builds')->search(
$filter,
{
rows => $nr,
order_by => ["id DESC"],
join => [ "jobset" ]
});
my @list;
push @list, buildToHash($_) foreach @latest;
@ -154,15 +160,25 @@ sub nrbuilds : Chained('api') PathPart('nrbuilds') Args(0) {
my $system = $c->request->params->{system};
my $filter = {finished => 1};
$filter->{project} = $project if ! $project eq "";
$filter->{jobset} = $jobset if ! $jobset eq "";
$filter->{"jobset.project"} = $project if ! $project eq "";
$filter->{"jobset.name"} = $jobset if ! $jobset eq "";
$filter->{job} = $job if !$job eq "";
$filter->{system} = $system if !$system eq "";
$base = 60*60 if($period eq "hour");
$base = 24*60*60 if($period eq "day");
my @stats = $c->model('DB::Builds')->search($filter, {select => [{ count => "*" }], as => ["nr"], group_by => ["timestamp - timestamp % $base"], order_by => "timestamp - timestamp % $base DESC", rows => $nr});
my @stats = $c->model('DB::Builds')->search(
$filter,
{
select => [{ count => "*" }],
as => ["nr"],
group_by => ["timestamp - timestamp % $base"],
order_by => "timestamp - timestamp % $base DESC",
rows => $nr,
join => [ "jobset" ]
}
);
my @arr;
push @arr, int($_->get_column("nr")) foreach @stats;
@arr = reverse(@arr);
@ -238,8 +254,10 @@ sub push : Chained('api') PathPart('push') Args(0) {
foreach my $r (@repos) {
triggerJobset($self, $c, $_, $force) foreach $c->model('DB::Jobsets')->search(
{ 'project.enabled' => 1, 'me.enabled' => 1 },
{ join => 'project'
, where => \ [ 'exists (select 1 from JobsetInputAlts where project = me.project and jobset = me.name and value = ?)', [ 'value', $r ] ]
{
join => 'project',
where => \ [ 'exists (select 1 from JobsetInputAlts where project = me.project and jobset = me.name and value = ?)', [ 'value', $r ] ],
order_by => 'me.id DESC'
});
}
@ -249,7 +267,6 @@ sub push : Chained('api') PathPart('push') Args(0) {
);
}
sub push_github : Chained('api') PathPart('push-github') Args(0) {
my ($self, $c) = @_;

215
t/Hydra/Controller/API/checks.t Normal file
View file

@ -0,0 +1,215 @@
use strict;
use warnings;
use Setup;
use Test2::V0;
use Catalyst::Test ();
use HTTP::Request;
use HTTP::Request::Common;
use JSON::MaybeXS qw(decode_json encode_json);
sub is_json {
my ($response, $message) = @_;
my $data;
my $valid_json = lives { $data = decode_json($response->content); };
ok($valid_json, $message // "We get back valid JSON.");
if (!$valid_json) {
use Data::Dumper;
print STDERR Dumper $response->content;
}
return $data;
}
my $ctx = test_context();
Catalyst::Test->import('Hydra');
my $finishedBuilds = $ctx->makeAndEvaluateJobset(
expression => "one-job.nix",
build => 1
);
my $queuedBuilds = $ctx->makeAndEvaluateJobset(
expression => "one-job.nix",
build => 0
);
subtest "/api/queue" => sub {
my $response = request(GET '/api/queue?nr=1');
ok($response->is_success, "The API enpdoint showing the queue returns 200.");
my $data = is_json($response);
my $build = $queuedBuilds->{"one_job"};
like($data, [{
priority => $build->priority,
id => $build->id,
}]);
};
subtest "/api/latestbuilds" => sub {
subtest "with no specific parameters" => sub {
my $response = request(GET '/api/latestbuilds?nr=1');
ok($response->is_success, "The API enpdoint showing the latest builds returns 200.");
my $data = is_json($response);
my $build = $finishedBuilds->{"one_job"};
like($data, [{
buildstatus => $build->buildstatus,
id => $build->id,
}]);
};
subtest "with very specific parameters" => sub {
my $build = $finishedBuilds->{"one_job"};
my $projectName = $build->project->name;
my $jobsetName = $build->jobset->name;
my $jobName = $build->job;
my $system = $build->system;
my $response = request(GET "/api/latestbuilds?nr=1&project=$projectName&jobset=$jobsetName&job=$jobName&system=$system");
ok($response->is_success, "The API enpdoint showing the latest builds returns 200.");
my $data = is_json($response);
like($data, [{
buildstatus => $build->buildstatus,
id => $build->id,
}]);
};
};
subtest "/api/nrbuilds" => sub {
subtest "with no specific parameters" => sub {
my $response = request(GET '/api/nrbuilds?nr=1&period=hour');
ok($response->is_success, "The API enpdoint showing the latest builds returns 200.");
my $data = is_json($response);
is($data, [1]);
};
subtest "with very specific parameters" => sub {
my $build = $finishedBuilds->{"one_job"};
my $projectName = $build->project->name;
my $jobsetName = $build->jobset->name;
my $jobName = $build->job;
my $system = $build->system;
my $response = request(GET "/api/nrbuilds?nr=1&period=hour&project=$projectName&jobset=$jobsetName&job=$jobName&system=$system");
ok($response->is_success, "The API enpdoint showing the latest builds returns 200.");
my $data = is_json($response);
is($data, [1]);
};
};
subtest "/api/push" => sub {
subtest "with a specific jobset" => sub {
my $build = $finishedBuilds->{"one_job"};
my $jobset = $build->jobset;
my $projectName = $jobset->project->name;
my $jobsetName = $jobset->name;
is($jobset->forceeval, undef, "The existing jobset is not set to be forced to eval");
my $response = request(GET "/api/push?jobsets=$projectName:$jobsetName&force=1");
ok($response->is_success, "The API enpdoint for triggering jobsets returns 200.");
my $data = is_json($response);
is($data, { jobsetsTriggered => [ "$projectName:$jobsetName" ] });
my $updatedJobset = $ctx->db->resultset('Jobsets')->find({ id => $jobset->id });
is($updatedJobset->forceeval, 1, "The jobset is now forced to eval");
};
subtest "with a specific source" => sub {
my $repo = $ctx->jobsdir;
my $jobsetA = $queuedBuilds->{"one_job"}->jobset;
my $jobsetB = $finishedBuilds->{"one_job"}->jobset;
is($jobsetA->forceeval, undef, "The existing jobset is not set to be forced to eval");
print STDERR $repo;
my $response = request(GET "/api/push?repos=$repo&force=1");
ok($response->is_success, "The API enpdoint for triggering jobsets returns 200.");
my $data = is_json($response);
is($data, { jobsetsTriggered => [
"${\$jobsetA->project->name}:${\$jobsetA->name}",
"${\$jobsetB->project->name}:${\$jobsetB->name}"
] });
my $updatedJobset = $ctx->db->resultset('Jobsets')->find({ id => $jobsetA->id });
is($updatedJobset->forceeval, 1, "The jobset is now forced to eval");
};
};
subtest "/api/push-github" => sub {
# Create a project and jobset which looks like it comes from GitHub
my $user = $ctx->db()->resultset('Users')->create({
username => "api-push-github",
emailaddress => 'api-push-github@example.org',
password => ''
});
my $project = $ctx->db()->resultset('Projects')->create({
name => "api-push-github",
displayname => "api-push-github",
owner => $user->username
});
subtest "with a legacy input type" => sub {
my $jobset = $project->jobsets->create({
name => "legacy-input-type",
nixexprinput => "src",
nixexprpath => "default.nix",
emailoverride => ""
});
my $jobsetinput = $jobset->jobsetinputs->create({name => "src", type => "git"});
$jobsetinput->jobsetinputalts->create({altnr => 0, value => "https://github.com/OWNER/LEGACY-REPO.git"});
my $req = POST '/api/push-github',
"Content-Type" => "application/json",
"Content" => encode_json({
repository => {
owner => {
name => "OWNER",
},
name => "LEGACY-REPO",
}
});
my $response = request($req);
ok($response->is_success, "The API enpdoint for triggering jobsets returns 200.");
my $data = is_json($response);
is($data, { jobsetsTriggered => [ "api-push-github:legacy-input-type" ] }, "The correct jobsets are triggered.");
};
subtest "with a flake input type" => sub {
my $jobset = $project->jobsets->create({
name => "flake-input-type",
type => 1,
flake => "github:OWNER/FLAKE-REPO",
emailoverride => ""
});
my $req = POST '/api/push-github',
"Content-Type" => "application/json",
"Content" => encode_json({
repository => {
owner => {
name => "OWNER",
},
name => "FLAKE-REPO",
}
});
my $response = request($req);
ok($response->is_success, "The API enpdoint for triggering jobsets returns 200.");
my $data = is_json($response);
is($data, { jobsetsTriggered => [ "api-push-github:flake-input-type" ] }, "The correct jobsets are triggered.");
};
};
done_testing;

8
t/jobs/one-job.nix Normal file
View file

@ -0,0 +1,8 @@
with import ./config.nix;
{
one_job =
mkDerivation {
name = "empty-dir";
builder = ./empty-dir-builder.sh;
};
}