From 8f764d21b0011056e1492d92afe3bd40b847b9f7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 5 Dec 2019 09:07:27 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/data_builder/build.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/gitlab')

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
-- 
cgit v1.2.3