From bb824c4973abe78b48827335b9f5d01a7f5da2f0 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Thu, 16 Mar 2023 14:16:24 +0100
Subject: benchmarking: Remove setting up gitaly-ruby

---
 _support/benchmarking/README.md                    |  2 +-
 _support/benchmarking/roles/gitaly/tasks/main.yml  |  1 -
 .../roles/gitaly/tasks/setup_gitaly.yml            | 19 -------------
 .../benchmarking/roles/gitaly/tasks/setup_ruby.yml | 33 ----------------------
 .../roles/gitaly/templates/config.toml.j2          |  4 ---
 5 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 _support/benchmarking/roles/gitaly/tasks/setup_ruby.yml

(limited to '_support')

diff --git a/_support/benchmarking/README.md b/_support/benchmarking/README.md
index bc439f19f..736856f82 100644
--- a/_support/benchmarking/README.md
+++ b/_support/benchmarking/README.md
@@ -62,7 +62,7 @@ On completion a tarball of the benchmark output will be written to
 have a directory for each repository tested against each RPC containing:
 
 - `ghz.json` - Output in JSON format from [ghz](https://ghz.sh) for the run.
-- `gitaly.log` - The main Gitaly log file. Gitaly-Ruby logs are not included.
+- `gitaly.log` - The main Gitaly log file.
 
 To retrieve the 99th percentile duration in milliseconds from `ghz.json` use:
 
diff --git a/_support/benchmarking/roles/gitaly/tasks/main.yml b/_support/benchmarking/roles/gitaly/tasks/main.yml
index 0f1a1f77f..5ea4581e4 100644
--- a/_support/benchmarking/roles/gitaly/tasks/main.yml
+++ b/_support/benchmarking/roles/gitaly/tasks/main.yml
@@ -5,7 +5,6 @@
 
 - include_tasks: initialize.yml
 - include_tasks: setup_go.yml
-- include_tasks: setup_ruby.yml
 - include_tasks: setup_gitaly.yml
 - include_tasks: setup_gitlab_shell.yml
 - include_tasks: setup_profiling.yml
diff --git a/_support/benchmarking/roles/gitaly/tasks/setup_gitaly.yml b/_support/benchmarking/roles/gitaly/tasks/setup_gitaly.yml
index 86c44f838..42f9a5e67 100644
--- a/_support/benchmarking/roles/gitaly/tasks/setup_gitaly.yml
+++ b/_support/benchmarking/roles/gitaly/tasks/setup_gitaly.yml
@@ -31,14 +31,6 @@
     owner: git
     group: git
 
-- name: Create gitaly-ruby directory
-  file:
-    path: /opt/gitaly-ruby
-    state: directory
-    mode: '0755'
-    owner: git
-    group: git
-
 - name: Install Gitaly build dependencies
   apt:
     name:
@@ -80,7 +72,6 @@
     chdir: /src/gitaly
   environment:
     PATH: '/usr/local/go/bin:{{ ansible_env.PATH }}'
-    BUNDLE_PATH: '/src/gitaly/.ruby'
   become_user: git
 
 - name: Install Gitaly to /opt/gitaly
@@ -93,18 +84,8 @@
     chdir: /src/gitaly
   environment:
     PATH: '/usr/local/go/bin:{{ ansible_env.PATH }}'
-    BUNDLE_PATH: '/src/gitaly/.ruby'
   become_user: git
 
-- name:  Copy Gitaly-Ruby to ruby directory
-  copy:
-    src: /src/gitaly/ruby/
-    dest: /opt/gitaly-ruby/
-    owner: git
-    group: git
-    mode: '0755'
-    remote_src: true
-
 - name: Install Gitaly config
   template:
     src: config.toml.j2
diff --git a/_support/benchmarking/roles/gitaly/tasks/setup_ruby.yml b/_support/benchmarking/roles/gitaly/tasks/setup_ruby.yml
deleted file mode 100644
index 0b07a72ee..000000000
--- a/_support/benchmarking/roles/gitaly/tasks/setup_ruby.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- name: Install Ruby build dependencies
-  apt:
-    name:
-      - autogen
-      - autoconf
-      - build-essential
-      - libtool
-      - libyaml-dev
-      - libreadline6-dev
-      - libncurses5-dev
-      - libffi-dev
-      - libgdbm-dev
-      - zlib1g-dev
-    state: present
-
-- name: Get ruby-build source
-  unarchive:
-    src: "https://github.com/rbenv/ruby-build/archive/refs/tags/v{{ ruby_build_version }}.tar.gz"
-    dest: /src
-    remote_src: true
-    creates: "/src/ruby-build-{{ ruby_build_version }}"
-  register: ruby_build
-  become_user: git
-
-- name: Install ruby-build
-  shell: "PREFIX=/usr/local /src/ruby-build-{{ ruby_build_version }}/install.sh"
-  when: ruby_build.changed == True
-
-- name: Build Ruby
-  shell: "ruby-build {{ hostvars[groups['client'][0]]['ruby_version'] }} /usr/local"
-  args:
-    creates: /usr/local/bin/ruby
diff --git a/_support/benchmarking/roles/gitaly/templates/config.toml.j2 b/_support/benchmarking/roles/gitaly/templates/config.toml.j2
index 9a9b2c230..f5a43907a 100644
--- a/_support/benchmarking/roles/gitaly/templates/config.toml.j2
+++ b/_support/benchmarking/roles/gitaly/templates/config.toml.j2
@@ -39,10 +39,6 @@ level = "info"
 format = "json"
 dir = "/var/log/gitaly"
 
-[gitaly-ruby]
-# The directory where gitaly-ruby is installed
-dir = "/opt/gitaly-ruby"
-
 [gitlab-shell]
 # The directory where gitlab-shell is installed
 dir = "/opt/gitlab-shell"
-- 
cgit v1.2.3