Commit 80c1626b authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '40994-fix-ee-ce-compatible-test' into 'master'

Make GITLAB_FEATURES in build_spec compatible with EE

Closes #40994

See merge request gitlab-org/gitlab-ce!17023
parents 0a22ff26 da64e97e
...@@ -1413,7 +1413,7 @@ describe Ci::Build do ...@@ -1413,7 +1413,7 @@ describe Ci::Build do
[ [
{ key: 'CI', value: 'true', public: true }, { key: 'CI', value: 'true', public: true },
{ key: 'GITLAB_CI', value: 'true', public: true }, { key: 'GITLAB_CI', value: 'true', public: true },
{ key: 'GITLAB_FEATURES', value: '', public: true }, { key: 'GITLAB_FEATURES', value: project.namespace.features.join(','), public: true },
{ key: 'CI_SERVER_NAME', value: 'GitLab', public: true }, { key: 'CI_SERVER_NAME', value: 'GitLab', public: true },
{ key: 'CI_SERVER_VERSION', value: Gitlab::VERSION, public: true }, { key: 'CI_SERVER_VERSION', value: Gitlab::VERSION, public: true },
{ key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true }, { key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment