diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-17 17:06:53 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-17 17:06:53 +0000 |
| commit | 4a10c813e726d09216c534bb0ad0ae50a0400259 (patch) | |
| tree | 13cb5186718980aa0af7e689d080027f79951683 /spec | |
| parent | d82b6d120eb54e389d775223b0c1615332143a42 (diff) | |
| parent | 5040ac68d853ab3fc9bd993140bb02d750b3a655 (diff) | |
| download | gitlab-ce-4a10c813e726d09216c534bb0ad0ae50a0400259.tar.gz | |
Merge branch 'jlenny-CI_COMMIT_SHORT_SHA' into 'master'
Add new predefined variable CI_COMMIT_SHORT_SHA
Closes #48061
See merge request gitlab-org/gitlab-ce!23822
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 89f78f629d4..fe7f5f8e1e3 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2114,6 +2114,7 @@ describe Ci::Build do { key: 'CI_JOB_NAME', value: 'test', public: true }, { key: 'CI_JOB_STAGE', value: 'test', public: true }, { key: 'CI_COMMIT_SHA', value: build.sha, public: true }, + { key: 'CI_COMMIT_SHORT_SHA', value: build.short_sha, public: true }, { key: 'CI_COMMIT_BEFORE_SHA', value: build.before_sha, public: true }, { key: 'CI_COMMIT_REF_NAME', value: build.ref, public: true }, { key: 'CI_COMMIT_REF_SLUG', value: build.ref_slug, public: true }, @@ -2725,6 +2726,7 @@ describe Ci::Build do it 'returns static predefined variables' do keys = %w[CI_JOB_NAME CI_COMMIT_SHA + CI_COMMIT_SHORT_SHA CI_COMMIT_REF_NAME CI_COMMIT_REF_SLUG CI_JOB_STAGE] |