From aff354e32f10292bc495488940c5e72b373818c0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Mar 2024 11:07:38 +0100 Subject: [PATCH] Don't send gitea status update when build is started This was the source of a flaky test because sometimes hydra-notify was quick enough to send out `buildStarted` and sometimes it apparently wasn't which was quickly spottable with `nix build --rebuild`. Removing that status update doesn't make a difference functionally, gitea doesn't differentiate between "queued" and "running", so we send the same status ("pending") out on both events, so we'd even safe one avoidable request. (cherry picked from commit 806c375c338b4e6a1d276b96994018908784bf11) --- flake.nix | 5 ++--- src/lib/Hydra/Plugin/GiteaStatus.pm | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 461684f5..c9ccb3d4 100644 --- a/flake.nix +++ b/flake.nix @@ -348,10 +348,9 @@ response = json.loads(data) - assert len(response) == 3, "Expected exactly three status updates for latest commit (queued, started, finished)!" + assert len(response) == 2, "Expected exactly three status updates for latest commit (queued, finished)!" assert response[0]['status'] == "success", "Expected finished status to be success!" - assert response[1]['status'] == "pending", "Expected started status to be pending!" - assert response[2]['status'] == "pending", "Expected queued status to be pending!" + assert response[1]['status'] == "pending", "Expected queued status to be pending!" machine.shutdown() ''; diff --git a/src/lib/Hydra/Plugin/GiteaStatus.pm b/src/lib/Hydra/Plugin/GiteaStatus.pm index 426c93f5..f3498941 100644 --- a/src/lib/Hydra/Plugin/GiteaStatus.pm +++ b/src/lib/Hydra/Plugin/GiteaStatus.pm @@ -88,10 +88,6 @@ sub buildQueued { common(@_, [], 0); } -sub buildStarted { - common(@_, [], 1); -} - sub buildFinished { common(@_, 2); }