Commit 519ffec4 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'master' into 'master'

#47845 - Propagate failure_reason to job webhook

See merge request gitlab-org/gitlab-ce!21143
parents 1fb93773 7b2ead6c
---
title: "#47845 Add failure_reason to job webhook"
merge_request: 21143
author: matemaciek
type: added
...@@ -1102,6 +1102,7 @@ X-Gitlab-Event: Build Hook ...@@ -1102,6 +1102,7 @@ X-Gitlab-Event: Build Hook
"build_finished_at": null, "build_finished_at": null,
"build_duration": null, "build_duration": null,
"build_allow_failure": false, "build_allow_failure": false,
"build_failure_reason": "script_failure",
"project_id": 380, "project_id": 380,
"project_name": "gitlab-org/gitlab-test", "project_name": "gitlab-org/gitlab-test",
"user": { "user": {
......
...@@ -28,6 +28,7 @@ module Gitlab ...@@ -28,6 +28,7 @@ module Gitlab
build_finished_at: build.finished_at, build_finished_at: build.finished_at,
build_duration: build.duration, build_duration: build.duration,
build_allow_failure: build.allow_failure, build_allow_failure: build.allow_failure,
build_failure_reason: build.failure_reason,
# TODO: do we still need it? # TODO: do we still need it?
project_id: project.id, project_id: project.id,
......
...@@ -15,6 +15,7 @@ describe Gitlab::DataBuilder::Build do ...@@ -15,6 +15,7 @@ describe Gitlab::DataBuilder::Build do
it { expect(data[:build_id]).to eq(build.id) } it { expect(data[:build_id]).to eq(build.id) }
it { expect(data[:build_status]).to eq(build.status) } it { expect(data[:build_status]).to eq(build.status) }
it { expect(data[:build_allow_failure]).to eq(false) } 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_id]).to eq(build.project.id) }
it { expect(data[:project_name]).to eq(build.project.full_name) } it { expect(data[:project_name]).to eq(build.project.full_name) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment