diff options
| author | Jason van den Hurk <jasonhurk@gmail.com> | 2019-03-28 13:53:35 +0100 |
|---|---|---|
| committer | Jason van den Hurk <jasonhurk@gmail.com> | 2019-04-10 11:13:04 +0200 |
| commit | af46d33fba477785dfbe5af2d38a2e4f0ed0b696 (patch) | |
| tree | 13073d4343b3f308498ed5c45db6c25206032b22 | |
| parent | e861af409df4139e2a1c7434b1ca490710c786f1 (diff) | |
| download | gitlab-ce-af46d33fba477785dfbe5af2d38a2e4f0ed0b696.tar.gz | |
Added the CI_REF_PROTECTED variable to the Gitlab runner
This variable shows if the branch the runner is executing is protected
or not.
References: #50909
| -rw-r--r-- | app/models/ci/pipeline.rb | 1 | ||||
| -rw-r--r-- | spec/models/ci/bridge_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/build_spec.rb | 3 | ||||
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index b81a3cf8362..9e382d483f1 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -638,6 +638,7 @@ module Ci variables.append(key: 'CI_COMMIT_MESSAGE', value: git_commit_message.to_s) variables.append(key: 'CI_COMMIT_TITLE', value: git_commit_full_title.to_s) variables.append(key: 'CI_COMMIT_DESCRIPTION', value: git_commit_description.to_s) + variables.append(key: 'CI_REF_PROTECTED', value: protected_ref?.to_s) if merge_request_event? && merge_request variables.append(key: 'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA', value: source_sha.to_s) diff --git a/spec/models/ci/bridge_spec.rb b/spec/models/ci/bridge_spec.rb index aacfbe3f180..fce53a96857 100644 --- a/spec/models/ci/bridge_spec.rb +++ b/spec/models/ci/bridge_spec.rb @@ -33,7 +33,7 @@ describe Ci::Bridge do CI_PROJECT_ID CI_PROJECT_NAME CI_PROJECT_PATH CI_PROJECT_PATH_SLUG CI_PROJECT_NAMESPACE CI_PIPELINE_IID CI_CONFIG_PATH CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE - CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION + CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION CI_REF_PROTECTED ] expect(bridge.scoped_variables_hash.keys).to include(*variables) diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 1352a2de2d7..4c717357bd0 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2227,7 +2227,8 @@ describe Ci::Build do { key: 'CI_PIPELINE_SOURCE', value: pipeline.source, public: true, masked: false }, { key: 'CI_COMMIT_MESSAGE', value: pipeline.git_commit_message, public: true, masked: false }, { key: 'CI_COMMIT_TITLE', value: pipeline.git_commit_title, public: true, masked: false }, - { key: 'CI_COMMIT_DESCRIPTION', value: pipeline.git_commit_description, public: true, masked: false } + { key: 'CI_COMMIT_DESCRIPTION', value: pipeline.git_commit_description, public: true, masked: false }, + { key: 'CI_REF_PROTECTED', value: pipeline.protected_ref?.to_s, public: true, masked: false } ] end diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index f3e78630c1b..9b86fbbefe8 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -670,7 +670,8 @@ describe Ci::Pipeline, :mailer do CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE CI_COMMIT_TITLE - CI_COMMIT_DESCRIPTION] + CI_COMMIT_DESCRIPTION + CI_REF_PROTECTED] end context 'when source is merge request' do |