diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-15 22:02:33 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-30 14:39:55 +0100 |
| commit | 27bc7da50afeb691355b7122b2f2a84e4baf71ee (patch) | |
| tree | f74518a70f00b5a58f283d2db43065c681d5e977 | |
| parent | a44c9b9e8e8dfbbc37056e812c3b263eb92b644b (diff) | |
| download | gitlab-ce-zj-use-static-images.tar.gz | |
Use alpine images where possiblezj-use-static-images
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c357c489f8..96b100a987a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,7 @@ before_script: - source ./scripts/prepare_build.sh - cp config/gitlab.yml.example config/gitlab.yml - bundle --version - - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS' - - retry gem install knapsack + - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs 4 $FLAGS' - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql' stages: @@ -32,6 +31,7 @@ stages: # Prepare and merge knapsack tests .knapsack-state: &knapsack-state + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3-static-analyses" services: [] variables: SETUP_DB: "false" @@ -207,10 +207,13 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21 # Other generic tests .ruby-static-analysis: &ruby-static-analysis + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3-static-analyses" variables: SIMPLECOV: "false" SETUP_DB: "false" USE_BUNDLE_INSTALL: "true" + cache: + key: 'ruby-static-2-3' .exec: &exec <<: *ruby-static-analysis @@ -328,7 +331,7 @@ migration paths: - git checkout -f FETCH_HEAD - cp config/resque.yml.example config/resque.yml - sed -i 's/localhost/redis/g' config/resque.yml - - bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3 + - bundle install --without postgres production --jobs 4 $FLAGS --retry=3 - rake db:drop db:create db:schema:load db:seed_fu - git checkout $CI_BUILD_REF - source scripts/prepare_build.sh |