Merge branch 'sh-geo-no-elasticsearch' into 'master'

Remove Elasticsearch from services for Geo 9.6 specs to save memory

See merge request gitlab-org/gitlab-ee!3770

.gitlab-ci.yml

@@ -68,11 +68,10 @@ stages:
     - redis:alpine
     - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
 
-.use-pg-9-6: &use-pg-9-6
+.use-pg-9-6-no-elasticsearch: &use-pg-9-6-no-elasticsearch
   services:
     - postgres:9.6
     - redis:alpine
-    - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
 
 .use-mysql: &use-mysql
   services:
@@ -124,7 +123,7 @@ stages:
 
 .rspec-geo-pg-9-6: &rspec-metadata-pg-geo
   <<: *rspec-metadata
-  <<: *use-pg-9-6
+  <<: *use-pg-9-6-no-elasticsearch
   stage: test
   script:
     - export NO_KNAPSACK=1