diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-03 11:43:13 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-03 11:43:13 +0000 |
commit | 71fe23c1bf7ec0cc875db3caf4f4046aa5f32c0f (patch) | |
tree | 5401ea3ed7dfbc6730aab0343b5522a8723dd6f8 | |
parent | 9d0757a292bd6344f235fe2349da6662cf957347 (diff) | |
parent | 29fa93b09c105571f1cc3ebf545a3a43fe41fd92 (diff) | |
download | gitlab-ce-71fe23c1bf7ec0cc875db3caf4f4046aa5f32c0f.tar.gz |
Merge branch 'use-custom-ruby-images' into 'master'
Use custom Ruby images to test builds
It allows us to remove redundant steps of installing required dependencies for every build.
See merge request !4506
-rw-r--r-- | .gitlab-ci.yml | 6 | ||||
-rw-r--r-- | CHANGELOG | 1 | ||||
-rwxr-xr-x | scripts/prepare_build.sh | 15 |
3 files changed, 3 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a11c4705e82..5d2fad03f19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,8 @@ -image: "ruby:2.3.1" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3-git-2.7-phantomjs-2.1" cache: key: "ruby-231" paths: - - vendor/apt - vendor/ruby variables: @@ -141,14 +140,13 @@ spinach 9 10: *spinach-knapsack # Execute all testing suites against Ruby 2.1 .ruby-21: &ruby-21 - image: "ruby:2.1" + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1" <<: *use-db only: - master cache: key: "ruby21" paths: - - vendor/apt - vendor/ruby .rspec-knapsack-ruby21: &rspec-knapsack-ruby21 diff --git a/CHANGELOG b/CHANGELOG index 4c8d9bd5d73..3849683a35e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ v 8.13.0 (unreleased) - Preserve label filters when sorting !6136 (Joseph Frazier) - Only update issuable labels if they have been changed - Take filters in account in issuable counters. !6496 + - Use custom Ruby images to test builds (registry.dev.gitlab.org/gitlab/gitlab-build-images:*) - Revoke button in Applications Settings underlines on hover. - Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska) - Fix Long commit messages overflow viewport in file tree diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 6e987e7d9c9..1eaafdce389 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -16,21 +16,6 @@ retry() { } if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then - mkdir -p vendor/apt - - # Install phantomjs package - pushd vendor/apt - PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64" - if [ ! -d "$PHANTOMJS_FILE" ]; then - curl -q -L "https://s3.amazonaws.com/gitlab-build-helpers/$PHANTOMJS_FILE.tar.bz2" | tar jx - fi - cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/" - 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 |