Merge branch 'sh-update-ruby-2.7.2' into 'master'

Update Ruby to v2.7.2

See merge request gitlab-org/gitaly!2633

7 files changed, 21 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f00345c62..1304cdc52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,16 +4,17 @@ stages:
   - publish
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.28
   tags:
     - gitlab-org
 
 variables:
   DOCKER_DRIVER: overlay2
-  CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.28
+  CUSTOM_IMAGE_VERSION: ruby-2.7-golang-1.13-git-2.28
   SAST_DISABLE_DIND: "true"
   SAST_DEFAULT_ANALYZERS: "gosec"
   GIT_VERSION: "v2.29.0"
+  RUBY_VERSION: "2.7"
 
 danger-review:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
@@ -34,7 +35,7 @@ danger-review:
       files:
         - Makefile
         - ruby/Gemfile.lock
-      prefix: git-${GIT_VERSION}
+      prefix: git-${GIT_VERSION}-ruby-${RUBY_VERSION}
     paths:
       - _build/git
       - _build/libgit2
@@ -50,7 +51,7 @@ danger-review:
       files:
         - Makefile
         - ruby/Gemfile.lock
-      prefix: git-${GIT_VERSION}
+      prefix: git-${GIT_VERSION}-ruby-${RUBY_VERSION}
     paths:
       - _build/git
       - _build/libgit2
@@ -64,7 +65,7 @@ danger-review:
     expire_in: 1 week
 
 .postgres_template: &postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.14-git-2.28-pgbouncer-1.14
   services:
     - postgres:11.8
   variables:
@@ -103,7 +104,7 @@ proto:
 build:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
   script:
     - go version
     - make all git
@@ -116,7 +117,7 @@ build:
 binaries:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
   only:
     - tags
   script:
@@ -138,7 +139,7 @@ binaries:
 
 test:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
   script:
     - go version
     - _build/git/bin/git version
@@ -159,7 +160,7 @@ test:
 
 test:master:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
   script:
     - go version
     - make all ${TARGET}
@@ -261,7 +262,7 @@ praefect_sql_test:
 
 lint:
   # Only Go 1.13 currently officially supported
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.13-git-2.28
   stage: test
   retry: 2
   script:
@@ -269,7 +270,7 @@ lint:
     - make lint
 
 objectinfo_fuzz_test:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.26
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.13-git-2.26
   extends: .fuzz_base
   stage: test
   script:
diff --git a/.ruby-version b/.ruby-version
index 338a5b5d8..37c2961c2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.6
+2.7.2
diff --git a/Dockerfile b/Dockerfile
index 8a9caf7e1..ad5f1904e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,4 +20,3 @@ RUN apt-get update -qq && \
 COPY . /app
 
 CMD ["/app/bin/gitaly", "/app/config/config.toml"]
-
diff --git a/Makefile b/Makefile
index 7d68d3498..6b4740189 100644
--- a/Makefile
+++ b/Makefile
@@ -355,6 +355,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
 # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
 # _build. Hence the '../' in front.
 ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
+	gem install bundler -v 1.17.3
 	${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging
 	${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS}
 	${Q}touch $@
diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile
index ca25a8dc6..d598a85eb 100644
--- a/_support/build-images/versioned/Dockerfile
+++ b/_support/build-images/versioned/Dockerfile
@@ -8,4 +8,4 @@ COPY ./Gemfile.lock /bundle-cache
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \
-    cd /bundle-cache && bundle install --path vendor/bundle
+    cd /bundle-cache && gem install bundler -v 1.17.3 && bundle install --path vendor/bundle
diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml
index 114a91204..c711d3dc6 100644
--- a/_support/instrumented-cluster/docker-compose.yml
+++ b/_support/instrumented-cluster/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
 
 services:
   gitaly1repos:
-    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27
+    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.27
     volumes:
       - gitalydata1:/repositories
       - ./gitaly1repos/setup.sh:/setup.sh
diff --git a/changelogs/unreleased/sh-update-ruby-2-7-2.yml b/changelogs/unreleased/sh-update-ruby-2-7-2.yml
new file mode 100644
index 000000000..9ce405074
--- /dev/null
+++ b/changelogs/unreleased/sh-update-ruby-2-7-2.yml
@@ -0,0 +1,5 @@
+---
+title: Update Ruby to v2.7.2
+merge_request: 2633
+author:
+type: other