From 88b5df417f86cc685b033d8315dfe187cee8bf98 Mon Sep 17 00:00:00 2001
From: John McDonnell <jmcdonnell@gitlab.com>
Date: Tue, 2 Apr 2024 14:41:48 +0100
Subject: [PATCH] Update gitaly config to avoid git_data_dirs.<storage>.path

Remove all usages of git_data_dirs.<storage>.path and replace with
gitaly['configuration']['storage']

Changelog: changed
---
 lib/gitlab/qa/component/gitaly.rb               | 17 ++++++++++-------
 .../test/instance/repository_storage.rb         |  6 ++----
 lib/gitlab/qa/scenario/test/integration/mtls.rb | 16 +++-------------
 .../qa/scenario/test/integration/praefect.rb    |  3 +--
 .../qa/runtime/omnibus_configuration_spec.rb    |  9 +++++++--
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/lib/gitlab/qa/component/gitaly.rb b/lib/gitlab/qa/component/gitaly.rb
index b704c39d..28d28e94 100644
--- a/lib/gitlab/qa/component/gitaly.rb
+++ b/lib/gitlab/qa/component/gitaly.rb
@@ -58,6 +58,11 @@ module Gitlab
           commands.each { |command| docker.exec(name, command) }
         end
 
+        def get_reconfigure_log_file_from_artefact
+          all_reconfigure_log_file = Dir["#{Runtime::Env.host_artifacts_dir}/*reconfigure.log"].sort_by { |f| File.mtime(f) }
+          all_reconfigure_log_file.last
+        end
+
         def gitaly_omnibus_configuration
           <<~OMNIBUS
             #{GitalyCluster.disable_other_omnibus_services}
@@ -68,15 +73,13 @@ module Gitlab
               'listen_addr': '0.0.0.0:#{gitaly_port}',
               'prometheus_listen_addr': '0.0.0.0:9236',
               'auth_token': 'PRAEFECT_INTERNAL_TOKEN',
-              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}}
-            }
+              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}},
+              'storage': [
+                  { name: '#{name}', path: '/var/opt/gitlab/git-data' }
+              ],
+            };
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';
-            git_data_dirs({
-              '#{name}' => {
-                'path' => '/var/opt/gitlab/git-data'
-              }
-            });
           OMNIBUS
         end
       end
diff --git a/lib/gitlab/qa/scenario/test/instance/repository_storage.rb b/lib/gitlab/qa/scenario/test/instance/repository_storage.rb
index 6ac43ae1..761180cd 100644
--- a/lib/gitlab/qa/scenario/test/instance/repository_storage.rb
+++ b/lib/gitlab/qa/scenario/test/instance/repository_storage.rb
@@ -53,12 +53,10 @@ module Gitlab
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   },
                   'gitaly' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/gitaly'
+                    'gitaly_address' => 'tcp://gitlab.test:8075'
                   },
                   'secondary' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/secondary'
+                    'gitaly_address' => 'tcp://gitlab.test:8075'
                   }
                 });
                 gitaly['enable'] = true;
diff --git a/lib/gitlab/qa/scenario/test/integration/mtls.rb b/lib/gitlab/qa/scenario/test/integration/mtls.rb
index 45a9a818..2bb3a95d 100644
--- a/lib/gitlab/qa/scenario/test/integration/mtls.rb
+++ b/lib/gitlab/qa/scenario/test/integration/mtls.rb
@@ -92,14 +92,8 @@ module Gitlab
                     key_path: '/etc/gitlab/ssl/gitaly.test.key',
                   },
                   storage: [
-                    {
-                      name: 'default',
-                      path: '/var/opt/gitlab/git-data/repositories',
-                    },
-                    {
-                      name: 'storage1',
-                      path: '/mnt/gitlab/git-data/repositories',
-                    },
+                    { name: 'default', path: '/var/opt/gitlab/git-data/storage/default' },
+                    { name: 'storage1', path: '/var/opt/gitlab/git-data/storage/storage1' }
                   ],
                 };
                 postgresql['enable'] = false;
@@ -111,6 +105,7 @@ module Gitlab
                 gitlab_exporter['enable'] = false;
                 alertmanager['enable'] = false;
                 prometheus['enable'] = false;
+                gitlab_kas['enable'] = false;
 
                 gitlab_rails['rake_cache_clear'] = false;
                 gitlab_rails['auto_migrate'] = false;
@@ -118,11 +113,6 @@ module Gitlab
                 gitlab_shell['secret_token'] = 'shellsecret';
 
                 gitlab_rails['internal_api_url'] = 'https://#{@gitlab_name}.#{@network}';
-
-                git_data_dirs({
-                  'default' => { 'path' => '/var/opt/gitlab/git-data' },
-                  'storage1' => { 'path' => '/mnt/gitlab/git-data' },
-                })
               OMNIBUS
             end
           end
diff --git a/lib/gitlab/qa/scenario/test/integration/praefect.rb b/lib/gitlab/qa/scenario/test/integration/praefect.rb
index fb95c0b2..f886a150 100644
--- a/lib/gitlab/qa/scenario/test/integration/praefect.rb
+++ b/lib/gitlab/qa/scenario/test/integration/praefect.rb
@@ -25,8 +25,7 @@ module Gitlab
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   },
                   'gitaly' => {
-                    'gitaly_address' => 'tcp://#{config.gitlab_name}.#{config.network}:8075',
-                    'path' => '/var/opt/gitlab/git-data'
+                    'gitaly_address' => 'tcp://#{config.gitlab_name}.#{config.network}:8075'
                   }
                 });
                 gitaly['enable'] = true;
diff --git a/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb b/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb
index b761200b..f380f606 100644
--- a/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb
+++ b/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb
@@ -179,8 +179,13 @@ module Gitlab::QA::Runtime
       it 'method invocations' do
         omnibusConfiguration.<< <<~OMNIBUS
           git_data_dirs({
-            'default' => '/test/default',
-            'alternative' => '/test/alternative'
+           'default' => {
+              'gitaly_address' => 'tcp://gitlab.test:8075',
+            },
+            'alternative' => {
+              'gitaly_address' => 'tcp://gitlab.test:8075',
+              'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+            }
           })
         OMNIBUS
 
-- 
GitLab