api: fix github webhook

Co-authored-by: Charlotte <lotte@chir.rs>

doc/manual/src/webhooks.md

@@ -1,9 +1,12 @@
 # Webhooks
 
-Hydra can be notified by github's webhook to trigger a new evaluation when a
+Hydra can be notified by github or gitea with webhooks to trigger a new evaluation when a
 jobset has a github repo in its input.
-To set up a github webhook go to `https://github.com/<yourhandle>/<yourrepo>/settings` and in the `Webhooks` tab
+
-click on `Add webhook`.
+## GitHub
+
+To set up a webhook for a GitHub repository go to `https://github.com/<yourhandle>/<yourrepo>/settings`
+and in the `Webhooks` tab click on `Add webhook`.
 
 - In `Payload URL` fill in `https://<your-hydra-domain>/api/push-github`.
 - In `Content type` switch to `application/json`.
@@ -11,3 +14,14 @@ click on `Add webhook`.
 - For `Which events would you like to trigger this webhook?` keep the default option for events on `Just the push event.`.
 
 Then add the hook with `Add webhook`.
+
+## Gitea
+
+To set up a webhook for a Gitea repository go to the settings of the repository in your Gitea instance
+and in the `Webhooks` tab click on `Add Webhook` and choose `Gitea` in the drop down.
+
+- In `Target URL` fill in `https://<your-hydra-domain>/api/push-gitea`.
+- Keep HTTP method `POST`, POST Content Type `application/json` and Trigger On `Push Events`.
+- Change the branch filter to match the git branch hydra builds.
+
+Then add the hook with `Add webhook`.

src/hydra-queue-runner/builder.cc

@@ -35,10 +35,18 @@ void State::builder(MachineReservation::ptr reservation)
             activeSteps_.lock()->erase(activeStep);
         });
 
+        auto conn(dbPool.get());
+
         try {
             auto destStore = getDestStore();
             // Might release the reservation.
-            res = doBuildStep(destStore, reservation, activeStep);
+            res = doBuildStep(destStore, reservation, *conn, activeStep);
+        } catch (pqxx::broken_connection & e) {
+            printMsg(lvlError, "db lost while building ‘%s’ on ‘%s’: %s (retriable)",
+                localStore->printStorePath(activeStep->step->drvPath),
+                reservation ? reservation->machine->sshName : std::string("(no machine)"),
+                e.what());
+            conn.markBad();
         } catch (std::exception & e) {
             printMsg(lvlError, "uncaught exception building ‘%s’ on ‘%s’: %s",
                 localStore->printStorePath(activeStep->step->drvPath),
@@ -76,6 +84,7 @@ void State::builder(MachineReservation::ptr reservation)
 
 State::StepResult State::doBuildStep(nix::ref<Store> destStore,
     MachineReservation::ptr & reservation,
+    Connection & conn,
     std::shared_ptr<ActiveStep> activeStep)
 {
     auto step(reservation->step);
@@ -106,8 +115,6 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
     buildOptions.maxLogSize = maxLogSize;
     buildOptions.enforceDeterminism = step->isDeterministic;
 
-    auto conn(dbPool.get());
-
     {
         std::set<Build::ptr> dependents;
         std::set<Step::ptr> steps;
@@ -132,7 +139,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         for (auto build2 : dependents) {
             if (build2->drvPath == step->drvPath) {
                 build = build2;
-                pqxx::work txn(*conn);
+                pqxx::work txn(conn);
                 notifyBuildStarted(txn, build->id);
                 txn.commit();
             }
@@ -187,7 +194,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
     /* If any of the outputs have previously failed, then don't bother
        building again. */
-    if (checkCachedFailure(step, *conn))
+    if (checkCachedFailure(step, conn))
         result.stepStatus = bsCachedFailure;
     else {
 
@@ -195,13 +202,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
            building. */
         {
             auto mc = startDbUpdate();
-            pqxx::work txn(*conn);
+            pqxx::work txn(conn);
             stepNr = createBuildStep(txn, result.startTime, buildId, step, machine->sshName, bsBusy);
             txn.commit();
         }
 
         auto updateStep = [&](StepState stepState) {
-            pqxx::work txn(*conn);
+            pqxx::work txn(conn);
             updateBuildStep(txn, buildId, stepNr, stepState);
             txn.commit();
         };
@@ -252,7 +259,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
     /* Finish the step in the database. */
     if (stepNr) {
-        pqxx::work txn(*conn);
+        pqxx::work txn(conn);
         finishBuildStep(txn, result, buildId, stepNr, machine->sshName);
         txn.commit();
     }
@@ -328,7 +335,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
             {
                 auto mc = startDbUpdate();
 
-                pqxx::work txn(*conn);
+                pqxx::work txn(conn);
 
                 for (auto & b : direct) {
                     printInfo("marking build %1% as succeeded", b->id);
@@ -356,7 +363,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         /* Send notification about the builds that have this step as
            the top-level. */
         {
-            pqxx::work txn(*conn);
+            pqxx::work txn(conn);
             for (auto id : buildIDs)
                 notifyBuildFinished(txn, id, {});
             txn.commit();
@@ -385,7 +392,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         }
 
     } else
-        failStep(*conn, step, buildId, result, machine, stepFinished);
+        failStep(conn, step, buildId, result, machine, stepFinished);
 
     // FIXME: keep stats about aborted steps?
     nrStepsDone++;

src/hydra-queue-runner/state.hh

@@ -594,6 +594,7 @@ private:
     enum StepResult { sDone, sRetry, sMaybeCancelled };
     StepResult doBuildStep(nix::ref<nix::Store> destStore,
         MachineReservation::ptr & reservation,
+        Connection & conn,
         std::shared_ptr<ActiveStep> activeStep);
 
     void buildRemote(nix::ref<nix::Store> destStore,

src/lib/Hydra/Controller/API.pm

@@ -273,7 +273,7 @@ sub push_github : Chained('api') PathPart('push-github') Args(0) {
     $c->{stash}->{json}->{jobsetsTriggered} = [];
 
     my $in = $c->request->{data};
-    my $owner = $in->{repository}->{owner}->{name} or die;
+    my $owner = $in->{repository}->{owner}->{login} or die;
     my $repo = $in->{repository}->{name} or die;
     print STDERR "got push from GitHub repository $owner/$repo\n";
 
@@ -285,6 +285,23 @@ sub push_github : Chained('api') PathPart('push-github') Args(0) {
     $c->response->body("");
 }
 
+sub push_gitea : Chained('api') PathPart('push-gitea') Args(0) {
+    my ($self, $c) = @_;
+
+    $c->{stash}->{json}->{jobsetsTriggered} = [];
+
+    my $in = $c->request->{data};
+    my $url = $in->{repository}->{clone_url} or die;
+    $url =~ s/.git$//;
+    print STDERR "got push from Gitea repository $url\n";
+
+    triggerJobset($self, $c, $_, 0) foreach $c->model('DB::Jobsets')->search(
+        { 'project.enabled' => 1, 'me.enabled' => 1 },
+        { join => 'project'
+        , where => \ [ 'me.flake like ? or exists (select 1 from JobsetInputAlts where project = me.project and jobset = me.name and value like ?)', [ 'flake', "%$url%"], [ 'value', "%$url%" ] ]
+        });
+    $c->response->body("");
+}
 
 
 1;

src/lib/Hydra/Controller/Root.pm

@@ -35,6 +35,7 @@ sub noLoginNeeded {
 
   return $whitelisted ||
          $c->request->path eq "api/push-github" ||
+         $c->request->path eq "api/push-gitea" ||
          $c->request->path eq "google-login" ||
          $c->request->path eq "github-redirect" ||
          $c->request->path eq "github-login" ||
@@ -80,7 +81,7 @@ sub begin :Private {
     $_->supportedInputTypes($c->stash->{inputTypes}) foreach @{$c->hydra_plugins};
 
     # XSRF protection: require POST requests to have the same origin.
-    if ($c->req->method eq "POST" && $c->req->path ne "api/push-github") {
+    if ($c->req->method eq "POST" && $c->req->path ne "api/push-github" && $c->req->path ne "api/push-gitea") {
         my $referer = $c->req->header('Referer');
         $referer //= $c->req->header('Origin');
         my $base = $c->req->base;

t/Hydra/Controller/API/checks.t

@@ -172,7 +172,7 @@ subtest "/api/push-github" => sub {
             "Content" => encode_json({
                 repository => {
                     owner => {
-                        name => "OWNER",
+                        login => "OWNER",
                     },
                     name => "LEGACY-REPO",
                 }
@@ -198,7 +198,7 @@ subtest "/api/push-github" => sub {
             "Content" => encode_json({
                 repository => {
                     owner => {
-                        name => "OWNER",
+                        login => "OWNER",
                     },
                     name => "FLAKE-REPO",
                 }