diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 12:07:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 12:07:27 +0300 |
commit | 8f764d21b0011056e1492d92afe3bd40b847b9f7 (patch) | |
tree | c1b5bc3eed8ac4d4b458466a9e4a548d94f389d9 /lib/gitlab/data_builder/build.rb | |
parent | f7ead77657cd7dc539319624301c22bf91b986e4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder/build.rb')
-rw-r--r-- | lib/gitlab/data_builder/build.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb index 3407380127e..f7b7db50b2f 100644 --- a/lib/gitlab/data_builder/build.rb +++ b/lib/gitlab/data_builder/build.rb @@ -31,6 +31,8 @@ module Gitlab build_duration: build.duration, build_allow_failure: build.allow_failure, build_failure_reason: build.failure_reason, + pipeline_id: commit.id, + runner: build_runner(build.runner), # TODO: do we still need it? project_id: project.id, @@ -43,6 +45,7 @@ module Gitlab }, commit: { + # note: commit.id is actually the pipeline id id: commit.id, sha: commit.sha, message: commit.git_commit_message, @@ -75,6 +78,17 @@ module Gitlab author = commit.try(:author) author ? Gitlab::Routing.url_helpers.user_url(author) : "mailto:#{pipeline.git_author_email}" end + + def build_runner(runner) + return unless runner + + { + id: runner.id, + description: runner.description, + active: runner.active?, + is_shared: runner.instance_type? + } + end end end end |