diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-09 16:44:30 +1100 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-09 16:44:30 +1100 |
| commit | da64e97e0c84f0e3354126bc427c34f7a0924d52 (patch) | |
| tree | 98c29afc325b82968812441519291dfb9cddf6b5 | |
| parent | c5ad5a082f85d2bcb5bb709198ac70812ae6c378 (diff) | |
| download | gitlab-ce-40994-fix-ee-ce-compatible-test.tar.gz | |
Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-test
Right now this fails in EE since the EE codebase defaults to having a starter license which means there are features in this value. This seems to be incompatible with the statement that tests should behave the same in CE as EE but I think that since there is a before on all EE specs creating a starter license it unfortunately does not behave that way.
This is needed for #40994 and fixes the failing specs in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4393
| -rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 9e159c3f1fe..d1952061498 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1413,7 +1413,7 @@ describe Ci::Build do [ { key: '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_VERSION', value: Gitlab::VERSION, public: true }, { key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true }, |