diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 00:10:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 00:10:48 +0300 |
commit | b9a2e3f2cc581cb8bd40f8273a13cd4c9daf59b5 (patch) | |
tree | 9dd9a2f54b5bc5a4816a1cb8e44f84b534e6597c /lib/gitlab/data_builder | |
parent | 57f6fa3cd786acb4ead4b7a2d3aa43b6c7abbc58 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r-- | lib/gitlab/data_builder/build.rb | 13 | ||||
-rw-r--r-- | lib/gitlab/data_builder/pipeline.rb | 12 |
2 files changed, 23 insertions, 2 deletions
diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb index e17bd25e57e..c4af5e6608e 100644 --- a/lib/gitlab/data_builder/build.rb +++ b/lib/gitlab/data_builder/build.rb @@ -62,7 +62,9 @@ module Gitlab git_http_url: project.http_url_to_repo, git_ssh_url: project.ssh_url_to_repo, visibility_level: project.visibility_level - } + }, + + environment: build_environment(build) } data @@ -86,6 +88,15 @@ module Gitlab tags: runner.tags&.map(&:name) } end + + def build_environment(build) + return unless build.has_environment? + + { + name: build.expanded_environment_name, + action: build.environment_action + } + end end end end diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index 3036bc57ca5..7fd1b9cd228 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -67,7 +67,8 @@ module Gitlab artifacts_file: { filename: build.artifacts_file&.filename, size: build.artifacts_size - } + }, + environment: environment_hook_attrs(build) } end @@ -80,6 +81,15 @@ module Gitlab tags: runner.tags&.map(&:name) } end + + def environment_hook_attrs(build) + return unless build.has_environment? + + { + name: build.expanded_environment_name, + action: build.environment_action + } + end end end end |