summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-04 00:24:33 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-04 00:24:33 +0200
commite6567bc13c3c92ed581e916306ecfb758e311f19 (patch)
tree884c373f40dd1c7fbc560d23370a212645a4e911
parent2e6f816d36d578014c7869ae61e65414fdeb1814 (diff)
downloadgitlab-ce-e6567bc13c3c92ed581e916306ecfb758e311f19.tar.gz
Use gitlab-build-images for precache some of the dependencies
-rw-r--r--.gitlab-ci.yml34
-rwxr-xr-xscripts/prepare_build.sh14
2 files changed, 12 insertions, 36 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9774602cbdc..85bf783ace6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
-image: "ruby:2.1"
+image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1
services:
- mysql:latest
- - redis:latest
+ - redis:alpine
cache:
key: "ruby21"
@@ -112,26 +112,16 @@ rspec 17 20: *knapsack
rspec 18 20: *knapsack
rspec 19 20: *knapsack
-spinach 0 20: *knapsack
-spinach 1 20: *knapsack
-spinach 2 20: *knapsack
-spinach 3 20: *knapsack
-spinach 4 20: *knapsack
-spinach 5 20: *knapsack
-spinach 6 20: *knapsack
-spinach 7 20: *knapsack
-spinach 8 20: *knapsack
-spinach 9 20: *knapsack
-spinach 10 20: *knapsack
-spinach 11 20: *knapsack
-spinach 12 20: *knapsack
-spinach 13 20: *knapsack
-spinach 14 20: *knapsack
-spinach 15 20: *knapsack
-spinach 16 20: *knapsack
-spinach 17 20: *knapsack
-spinach 18 20: *knapsack
-spinach 19 20: *knapsack
+spinach 0 10: *knapsack
+spinach 1 10: *knapsack
+spinach 2 10: *knapsack
+spinach 3 10: *knapsack
+spinach 4 10: *knapsack
+spinach 5 10: *knapsack
+spinach 6 10: *knapsack
+spinach 7 10: *knapsack
+spinach 8 10: *knapsack
+spinach 9 10: *knapsack
teaspoon: *exec
rubocop: *exec
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 247383aa46c..9540d7d128f 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -12,20 +12,6 @@ retry() {
}
if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
- mkdir -p vendor
-
- # Install phantomjs package
- pushd vendor
- if [ ! -e phantomjs_1.9.8-0jessie_amd64.deb ]; then
- wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
- fi
- dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
- popd
-
- # Try to install packages
- retry 'apt-get update -yqqq; apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
- libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip'
-
cp config/database.yml.mysql config/database.yml
sed -i 's/username:.*/username: root/g' config/database.yml
sed -i 's/password:.*/password:/g' config/database.yml