Merged r22468 to r22470 from trunk.

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22471 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 8c7f8b68f9cec4b3bff38247472860ddc1d075f5..9800c226ec4beba6e0aa977be2eb92a24229d668 100644 (file)
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -58,8 +58,9 @@ file 'config/database.yml' do
   case database
   when /(mysql|mariadb)/
     dev_conf =  {'adapter' => 'mysql2',
-                 'database' => dev_db_name, 'host' => 'localhost',
-                 'encoding' => 'utf8'}
+                 'database' => dev_db_name, 'host' => (ENV['CI_MYSQL_HOST'] || 'localhost'),
+                 'encoding' => 'utf8',
+                 'ssl_mode' => 'disabled'}
     if ENV['RUN_ON_NOT_OFFICIAL']
       dev_conf['username'] = 'root'
     else
@@ -69,7 +70,7 @@ file 'config/database.yml' do
     test_conf = dev_conf.merge('database' => test_db_name)
   when /postgresql/
     dev_conf =  {'adapter' => 'postgresql', 'database' => dev_db_name,
-                 'host' => 'localhost'}
+                 'host' => (ENV['CI_PG_HOST'] || 'localhost')}
     if ENV['RUN_ON_NOT_OFFICIAL']
       dev_conf['username'] = 'postgres'
     else