Merge branch 'sh-upgrade-to-ruby-2.4' into 'master'

Upgrade to Ruby 2.4.4

See merge request gitlab-org/gitaly!725

4 files changed, 33 insertions, 24 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20c3a04a4..c7d5897fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.14
+image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.17
 
 stages:
   - build
@@ -7,7 +7,7 @@ stages:
 
 variables:
   DOCKER_DRIVER: overlay
-  CUSTOM_IMAGE_VERSION: ruby-2.3-golang-1.9-git-2.14
+  CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.9-git-2.17
 
 verify:
   stage: test
@@ -29,7 +29,7 @@ danger-review:
     # Override gemfile config (for some reasong `config --delete` doesn't do it)
     - bundle config --local gemfile Gemfile
   cache:
-    key: gems
+    key: gems-ruby-2.4
     paths:
       - ruby/vendor/bundle
 
@@ -61,7 +61,7 @@ danger-review:
   stage: test
   # Override the ruby_definition cache definition for pull
   cache:
-    key: gems
+    key: gems-ruby-2.4
     paths:
       - ruby/vendor/bundle
     policy: pull
@@ -75,48 +75,52 @@ danger-review:
 
 build:go1.10:
   <<: *build_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.16
 
 build:go1.9:
   <<: *build_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.16
 
 binaries_go1.10:
   <<: *assemble_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.16
 
 binaries_go1.9:
   <<: *assemble_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.16
 
 test:default:
   <<: *test_definition
 
-test:go1.9-git2.9:
+test:go1.9-git2.9-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.9
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.9
 
-test:go1.9-git2.14:
+test:go1.9-git2.14-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.14
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.14
 
-test:go1.10-git2.14:
+test:go1.10-git2.14-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.14
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.14
 
-test:go1.9-git2.16:
+test:go1.9-git2.16-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.16
 
-test:go1.10-git2.16:
+test:go1.10-git2.16-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.16
 
-test:go1.9-git2.17:
+test:go1.9-git2.17-ruby-2.4:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.17
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.17
 
-test:go1.10-git2.17:
+test:go1.10-git2.17-ruby.2-4:
+  <<: *test_definition
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.17
+
+test:go1.10-git2.17-ruby-2.3:
   <<: *test_definition
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.17
 
diff --git a/Dockerfile b/Dockerfile
index 7a2209298..f10615d42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@
 # See the _support/load-cluster/docker-compose.yml for an example of how to use
 # this image
 #
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.14
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2-4-golang-1.9-git-2.17
 
 RUN mkdir -p /app/ruby
 
diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml
index d8b217a50..bb5a20396 100644
--- a/_support/instrumented-cluster/docker-compose.yml
+++ b/_support/instrumented-cluster/docker-compose.yml
@@ -1,8 +1,8 @@
-version: "2.3"
+version: "2.4"
 
 services:
   gitaly1repos:
-    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.13
+    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.17
     volumes:
       - gitalydata1:/repositories
       - ./gitaly1repos/setup.sh:/setup.sh
diff --git a/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml b/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml
new file mode 100644
index 000000000..42665ab9c
--- /dev/null
+++ b/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade to Ruby 2.4.4
+merge_request: 725
+author:
+type: other