summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-08-27 11:48:36 -0500
committerRobert Speicher <rspeicher@gmail.com>2019-08-27 12:35:13 -0500
commit9c1feda7a2453237ab0f45789985041bbbdddf78 (patch)
treeec8ab51344c0d75105537bbb46b75f5481855674 /.gitlab-ci.yml
parent27c222d16ccb666878c7ac558f484efa56f77f37 (diff)
downloadgitlab-ce-9c1feda7a2453237ab0f45789985041bbbdddf78.tar.gz
Assimilate EE-specific CI variables
Having these defined in both CE and EE won't hurt anything.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c7a8c05b37..27992024265 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,11 @@ variables:
GIT_SUBMODULE_STRATEGY: "none"
GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
+ EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
BUILD_ASSETS_IMAGE: "false"
+ ES_JAVA_OPTS: "-Xms256m -Xmx256m"
+ ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
after_script:
- date