From 420bebddb2c887b13937b5a41f8004f9f5295bba Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Mon, 10 Jul 2023 12:51:30 +0500
Subject: [PATCH] feat: update Ruby version from 2.5.7 to 3.0.4 for
 cs_comment_service

---
 playbooks/roles/forum/defaults/main.yml |  4 +++-
 playbooks/roles/forum/tasks/deploy.yml  | 11 ++++++++++-
 playbooks/roles/rbenv/defaults/main.yml |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/playbooks/roles/forum/defaults/main.yml b/playbooks/roles/forum/defaults/main.yml
index d9ad4c19ac7..f377c9fcde9 100644
--- a/playbooks/roles/forum/defaults/main.yml
+++ b/playbooks/roles/forum/defaults/main.yml
@@ -7,6 +7,7 @@ forum_rbenv_dir: "{{ forum_app_dir }}"
 forum_rbenv_root: "{{ forum_app_dir }}/.rbenv"
 forum_rbenv_shims: "{{ forum_rbenv_root }}/shims"
 forum_rbenv_bin: "{{ forum_rbenv_root }}/bin"
+forum_gemfile: 'Gemfile3'
 forum_supervisor_wrapper: "{{ forum_app_dir }}/forum-supervisor.sh"
 forum_gem_root: "{{ forum_rbenv_dir }}/.gem"
 forum_gem_bin: "{{ forum_gem_root }}/bin"
@@ -63,6 +64,7 @@ FORUM_REBUILD_INDEX: false
 FORUM_ENABLE_MONGODB_INDEXES: false
 
 forum_base_env: &forum_base_env
+  BUNDLE_GEMFILE: "{{ forum_gemfile }}"
   RBENV_ROOT: "{{ forum_rbenv_root }}"
   GEM_HOME: "{{ forum_gem_root }}"
   GEM_PATH: "{{ forum_gem_root }}"
@@ -100,7 +102,7 @@ devstack_forum_env:
   MONGOID_AUTH_MECH: "{{ FORUM_MONGO_AUTH_MECH }}"
 
 forum_user: "forum"
-FORUM_RUBY_VERSION: "2.5.7"
+FORUM_RUBY_VERSION: "3.0.4"
 forum_source_repo: "https://github.com/openedx/cs_comments_service.git"
 FORUM_VERSION: "master"
 
diff --git a/playbooks/roles/forum/tasks/deploy.yml b/playbooks/roles/forum/tasks/deploy.yml
index c3cab2c68db..48ce1f407cd 100644
--- a/playbooks/roles/forum/tasks/deploy.yml
+++ b/playbooks/roles/forum/tasks/deploy.yml
@@ -51,8 +51,17 @@
     - install
     - install:code
 
+- name: configure comments service bundle
+  shell: "bundle config set --local deployment 'true' chdir={{ forum_code_dir }}"
+  become_user: "{{ forum_user }}"
+  environment: "{{ forum_base_env }}"
+  notify: restart the forum service
+  tags:
+    - install
+    - install:app-requirements
+
 - name: install comments service bundle
-  shell: "bundle install --deployment --path {{ forum_gem_root }} chdir={{ forum_code_dir }}"
+  shell: "bundle install chdir={{ forum_code_dir }}"
   become_user: "{{ forum_user }}"
   environment: "{{ forum_base_env }}"
   notify: restart the forum service
diff --git a/playbooks/roles/rbenv/defaults/main.yml b/playbooks/roles/rbenv/defaults/main.yml
index 68d402f6ab9..5350faac24b 100644
--- a/playbooks/roles/rbenv/defaults/main.yml
+++ b/playbooks/roles/rbenv/defaults/main.yml
@@ -1,12 +1,13 @@
 ---
 
 RBENV_VERSION: 'v1.0.0'
-RBENV_BUNDLER_VERSION: '1.11.2'
-RBENV_RAKE_VERSION: '10.4.2'
+RBENV_BUNDLER_VERSION: '2.3.4'
+RBENV_RAKE_VERSION: '13.0.6'
 rbenv_root: "{{ rbenv_dir }}/.rbenv"
 rbenv_gem_root: "{{ rbenv_dir }}/.gem"
 rbenv_gem_bin: "{{ rbenv_gem_root }}/bin"
-RBENV_RUBYGEMS_VERSION: '2.7.8'
+rbenv_gemfile: 'Gemfile3'
+RBENV_RUBYGEMS_VERSION: '3.2.33'
 rbenv_bin: "{{ rbenv_dir }}/.rbenv/bin"
 rbenv_shims: "{{ rbenv_root }}/shims"
 rbenv_path: "{{ rbenv_bin }}:{{ rbenv_shims }}:{{ rbenv_gem_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -20,6 +21,7 @@ rbenv_debian_pkgs:
   - libxslt1-dev
   - zlib1g-dev
 rbenv_environment:
+  BUNDLE_GEMFILE: "{{ rbenv_gemfile }}"
   RBENV_ROOT: "{{ rbenv_root }}"
   GEM_ROOT: "{{ rbenv_gem_root }}"
   GEM_HOME: "{{ rbenv_gem_root }}"