Merge branch 'add-ci-variable-protected-ref' into 'master'
Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
This commit is contained in:
commit
7734b834fb
|
@ -642,6 +642,7 @@ module Ci
|
||||||
variables.append(key: 'CI_COMMIT_MESSAGE', value: git_commit_message.to_s)
|
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_TITLE', value: git_commit_full_title.to_s)
|
||||||
variables.append(key: 'CI_COMMIT_DESCRIPTION', value: git_commit_description.to_s)
|
variables.append(key: 'CI_COMMIT_DESCRIPTION', value: git_commit_description.to_s)
|
||||||
|
variables.append(key: 'CI_COMMIT_REF_PROTECTED', value: (!!protected_ref?).to_s)
|
||||||
|
|
||||||
if merge_request_event? && merge_request
|
if merge_request_event? && merge_request
|
||||||
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA', value: source_sha.to_s)
|
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA', value: source_sha.to_s)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Add CI_COMMIT_REF_PROTECTED CI variable
|
||||||
|
merge_request: 26716
|
||||||
|
author: Jason van den Hurk
|
||||||
|
type: added
|
|
@ -84,6 +84,7 @@ future GitLab releases.**
|
||||||
| `CI_PROJECT_PATH_SLUG` | 9.3 | all | `$CI_PROJECT_PATH` lowercased and with everything except `0-9` and `a-z` replaced with `-`. Use in URLs and domain names. |
|
| `CI_PROJECT_PATH_SLUG` | 9.3 | all | `$CI_PROJECT_PATH` lowercased and with everything except `0-9` and `a-z` replaced with `-`. Use in URLs and domain names. |
|
||||||
| `CI_PROJECT_URL` | 8.10 | 0.5 | The HTTP(S) address to access project |
|
| `CI_PROJECT_URL` | 8.10 | 0.5 | The HTTP(S) address to access project |
|
||||||
| `CI_PROJECT_VISIBILITY` | 10.3 | all | The project visibility (internal, private, public) |
|
| `CI_PROJECT_VISIBILITY` | 10.3 | all | The project visibility (internal, private, public) |
|
||||||
|
| `CI_COMMIT_REF_PROTECTED` | 11.11 | all | If the job is running on a protected branch |
|
||||||
| `CI_REGISTRY` | 8.10 | 0.5 | If the Container Registry is enabled it returns the address of GitLab's Container Registry |
|
| `CI_REGISTRY` | 8.10 | 0.5 | If the Container Registry is enabled it returns the address of GitLab's Container Registry |
|
||||||
| `CI_REGISTRY_IMAGE` | 8.10 | 0.5 | If the Container Registry is enabled for the project it returns the address of the registry tied to the specific project |
|
| `CI_REGISTRY_IMAGE` | 8.10 | 0.5 | If the Container Registry is enabled for the project it returns the address of the registry tied to the specific project |
|
||||||
| `CI_REGISTRY_PASSWORD` | 9.0 | all | The password to use to push containers to the GitLab Container Registry |
|
| `CI_REGISTRY_PASSWORD` | 9.0 | all | The password to use to push containers to the GitLab Container Registry |
|
||||||
|
|
|
@ -33,7 +33,7 @@ describe Ci::Bridge do
|
||||||
CI_PROJECT_ID CI_PROJECT_NAME CI_PROJECT_PATH
|
CI_PROJECT_ID CI_PROJECT_NAME CI_PROJECT_PATH
|
||||||
CI_PROJECT_PATH_SLUG CI_PROJECT_NAMESPACE CI_PIPELINE_IID
|
CI_PROJECT_PATH_SLUG CI_PROJECT_NAMESPACE CI_PIPELINE_IID
|
||||||
CI_CONFIG_PATH CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE
|
CI_CONFIG_PATH CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE
|
||||||
CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION
|
CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION CI_COMMIT_REF_PROTECTED
|
||||||
]
|
]
|
||||||
|
|
||||||
expect(bridge.scoped_variables_hash.keys).to include(*variables)
|
expect(bridge.scoped_variables_hash.keys).to include(*variables)
|
||||||
|
|
|
@ -2183,7 +2183,8 @@ describe Ci::Build do
|
||||||
{ key: 'CI_PIPELINE_SOURCE', value: pipeline.source, public: true, masked: false },
|
{ 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_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_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_COMMIT_REF_PROTECTED', value: (!!pipeline.protected_ref?).to_s, public: true, masked: false }
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -690,7 +690,8 @@ describe Ci::Pipeline, :mailer do
|
||||||
CI_PIPELINE_SOURCE
|
CI_PIPELINE_SOURCE
|
||||||
CI_COMMIT_MESSAGE
|
CI_COMMIT_MESSAGE
|
||||||
CI_COMMIT_TITLE
|
CI_COMMIT_TITLE
|
||||||
CI_COMMIT_DESCRIPTION]
|
CI_COMMIT_DESCRIPTION
|
||||||
|
CI_COMMIT_REF_PROTECTED]
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when source is merge request' do
|
context 'when source is merge request' do
|
||||||
|
|
Loading…
Reference in New Issue