Merge branch 'master' into 'master'

#47845 - Propagate failure_reason to job webhook

See merge request gitlab-org/gitlab-ce!21143

changelogs/unreleased/47845-propagate_failure_reason-to-job-webhook.yml

+---
+title: "#47845 Add failure_reason to job webhook"
+merge_request: 21143
+author: matemaciek
+type: added

doc/user/project/integrations/webhooks.md

@@ -1102,6 +1102,7 @@ X-Gitlab-Event: Build Hook
   "build_finished_at": null,
   "build_duration": null,
   "build_allow_failure": false,
+  "build_failure_reason": "script_failure",
   "project_id": 380,
   "project_name": "gitlab-org/gitlab-test",
   "user": {

lib/gitlab/data_builder/build.rb

@@ -28,6 +28,7 @@ module Gitlab
           build_finished_at: build.finished_at,
           build_duration: build.duration,
           build_allow_failure: build.allow_failure,
+          build_failure_reason: build.failure_reason,
 
           # TODO: do we still need it?
           project_id: project.id,

spec/lib/gitlab/data_builder/build_spec.rb

@@ -15,6 +15,7 @@ describe Gitlab::DataBuilder::Build do
     it { expect(data[:build_id]).to eq(build.id) }
     it { expect(data[:build_status]).to eq(build.status) }
     it { expect(data[:build_allow_failure]).to eq(false) }
+    it { expect(data[:build_failure_reason]).to eq(build.failure_reason) }
     it { expect(data[:project_id]).to eq(build.project.id) }
     it { expect(data[:project_name]).to eq(build.project.full_name) }