summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-01-22 15:40:56 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-01-22 15:40:56 +0000
commit0e51ca7c4841bb388c0decb57ecc64af86c77805 (patch)
treeb26261bff265b3ae58bdb9d2f3e086c4de817c17
parentfaa9ca0900438809a8faa21bc6daca1364cc6eaa (diff)
parentd91335293a2c950503f36071899300030b6ec0b1 (diff)
downloadgitlab-ce-0e51ca7c4841bb388c0decb57ecc64af86c77805.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 ac8390074f4..2dc09e4a1a5 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