diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-12-16 13:24:03 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-12-16 13:24:03 +0100 |
| commit | c945a0a7141ddf80e58e821178195cc48b8143f0 (patch) | |
| tree | 9dcc3cdf890800b6c4a3ad006c04b0c1c2e6530a /app/models/ci/build.rb | |
| parent | 45bd2263698892b9de6eb7956e3085a61054f49f (diff) | |
| download | gitlab-ce-expose-deployment-variables.tar.gz | |
Pass variables from deployment project services to CI runnerexpose-deployment-variables
This commit introduces the concept of deployment variables - variables
that are collected from deployment services and passed to CI runner
during a deployment build.
Deployment services specify the variables by overriding
"predefined_variables" method.
This commit also configures variables for KubernetesService
Diffstat (limited to 'app/models/ci/build.rb')
| -rw-r--r-- | app/models/ci/build.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index fdbf28a1d68..591aba6bdc9 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -155,7 +155,7 @@ module Ci end def has_environment? - self.environment.present? + environment.present? end def starts_environment? @@ -221,6 +221,7 @@ module Ci variables += pipeline.predefined_variables variables += runner.predefined_variables if runner variables += project.container_registry_variables + variables += project.deployment_variables if has_environment? variables += yaml_variables variables += user_variables variables += project.secret_variables |