Merge branch 'fix-elastic-search-service-hostname' into 'master'

Fix ELASTIC_HOST env var in order to use a friendly value for URI parser.

REF: gitlab-org/gitlab-ci-multi-runner#1628

See merge request !694

.gitlab-ci.yml

@@ -10,7 +10,7 @@ variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
   # retry tests only in CI environment
   RSPEC_RETRY_RETRY_COUNT: "3"
-  ELASTIC_HOST: "registry.gitlab.com__gitlab-org__test-elastic-image"
+  ELASTIC_HOST: "registry.gitlab.com-gitlab-org-test-elastic-image"
   RAILS_ENV: "test"
   SIMPLECOV: "true"
   USE_DB: "true"

spec/support/webmock.rb

@@ -2,4 +2,4 @@ require 'webmock'
 require 'webmock/rspec'
 
 WebMock.disable_net_connect!(allow_localhost: true, allow: 'elasticsearch')
-WebMock.disable_net_connect!(allow_localhost: true, allow: 'registry.gitlab.com__gitlab-org__test-elastic-image')
+WebMock.disable_net_connect!(allow_localhost: true, allow: 'registry.gitlab.com-gitlab-org-test-elastic-image')