summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2016-01-22 15:40:56 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-01-22 11:41:52 -0800
commit2a759e16fd27d78b8d6325477af4998a9bea0da6 (patch)
treec0c27c13c0d94888e576cb1f2f2e3c81cf7a2d1d
parent4c08a7b097163ec5e6b1d2feaa99ed17df2fe4f2 (diff)
downloadgitlab-ce-2a759e16fd27d78b8d6325477af4998a9bea0da6.tar.gz
Merge branch 'mysql-password-ci' into 'master'
Allow empty Mysql password on CI [ci skip] See merge request !2558
-rw-r--r--.gitlab-ci.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c23a7a3bf0e..d803f3c860b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,13 @@
-# This file is generated by GitLab CI
+image: "ruby:2.1"
+
+services:
+ - mysql:latest
+ - postgres:latest
+ - redis:latest
+
+variables:
+ MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+
before_script:
- ./scripts/prepare_build.sh
- ruby -v