diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-18 14:05:29 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-18 14:05:29 +0200 |
| commit | d9a3f020be570f135c0ce7c7676b4c1ed332ce1d (patch) | |
| tree | b9c28899bdef3238a1def24fda7a3141565882f3 /app/models | |
| parent | 9f7deb85b5d6937e6cf7068b864f49693b4a2623 (diff) | |
| download | gitlab-ce-d9a3f020be570f135c0ce7c7676b4c1ed332ce1d.tar.gz | |
Separate persisted and runtime pipeline variables
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 1 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 61c10c427dd..78f054a6527 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -599,6 +599,7 @@ module Ci break variables unless persisted? variables + .concat(pipeline.persisted_variables) .append(key: 'CI_JOB_ID', value: id.to_s) .append(key: 'CI_JOB_TOKEN', value: token, public: false) .append(key: 'CI_BUILD_ID', value: id.to_s) diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 7d7349b04bc..53af87a271a 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -530,7 +530,7 @@ module Ci end def predefined_variables - persisted_variables + Gitlab::Ci::Variables::Collection.new .append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path) .append(key: 'CI_PIPELINE_SOURCE', value: source.to_s) .append(key: 'CI_COMMIT_MESSAGE', value: git_commit_message) |