Commit 471fb979 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-ee-builds' into 'master'

Fix EE builds

If we specify a new `services` in context of `job` we need to specify all used services, because they overwrite what is specified in global context.

It did not fail for some builds, because we still have mixed infrastructure: Some runners do have pre-configured mysql, postgres and redis in their environment.

All future runners will be migrated to drop the pre-configured services.

/cc @vsizov 


See merge request !176
parents b716d676 4776323e
......@@ -2,7 +2,6 @@ image: "ruby:2.2"
services:
- mysql:latest
- postgres:latest
- redis:latest
variables:
......@@ -41,6 +40,8 @@ spec:models:
- ruby
- mysql
services:
- mysql:latest
- redis:latest
- elasticsearch:latest
spec:lib:
......@@ -50,6 +51,8 @@ spec:lib:
- ruby
- mysql
services:
- mysql:latest
- redis:latest
- elasticsearch:latest
spec:services:
......@@ -74,6 +77,8 @@ spec:other:
- ruby
- mysql
services:
- mysql:latest
- redis:latest
- elasticsearch:latest
spinach:project:half:
......@@ -90,6 +95,8 @@ spinach:project:rest:
- ruby
- mysql
services:
- mysql:latest
- redis:latest
- elasticsearch:latest
spinach:other:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment