Showing content from https://gitlab.com/gitlab-org/gitlab-qa/-/merge_requests/1425.patch below:
From a835fa45d79ea267f68be2e8f95de3757ba41070 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Fri, 16 May 2025 12:06:00 +1000 Subject: [PATCH 1/4] Revert "Merge branch 'jmc-git-data-dir' into 'master'" This reverts merge request !1423 --- lib/gitlab/qa/component/gitaly.rb | 13 +++++----- .../qa/scenario/test/instance/airgapped.rb | 6 ++--- .../test/instance/repository_storage.rb | 25 ++++++++++--------- .../test/integration/gitaly_cluster.rb | 6 ++--- .../qa/scenario/test/integration/mtls.rb | 17 +++++++------ .../qa/scenario/test/integration/praefect.rb | 10 ++++---- .../qa/runtime/omnibus_configuration_spec.rb | 16 +++--------- 7 files changed, 43 insertions(+), 50 deletions(-) diff --git a/lib/gitlab/qa/component/gitaly.rb b/lib/gitlab/qa/component/gitaly.rb index 53edc009d..b704c39d8 100644 --- a/lib/gitlab/qa/component/gitaly.rb +++ b/lib/gitlab/qa/component/gitaly.rb @@ -68,16 +68,15 @@ 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?}}, - storage: [ - { - name: '#{name}', - path: '/var/opt/gitlab/git-data/repositories', - }, - ] + 'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}} } 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/airgapped.rb b/lib/gitlab/qa/scenario/test/instance/airgapped.rb index 72304c780..8c3ad172e 100644 --- a/lib/gitlab/qa/scenario/test/instance/airgapped.rb +++ b/lib/gitlab/qa/scenario/test/instance/airgapped.rb @@ -102,12 +102,12 @@ module Gitlab <<~OMNIBUS external_url 'http://#{config.gitlab_name}.#{iptables_restricted_network}'; - gitlab_rails['repositories_storages'] = { + git_data_dirs({ 'default' => { - 'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}", + 'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}', 'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN' } - }; + }); gitaly['enable'] = false; gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN'; prometheus['scrape_configs'] = [ diff --git a/lib/gitlab/qa/scenario/test/instance/repository_storage.rb b/lib/gitlab/qa/scenario/test/instance/repository_storage.rb index 6ae81e7fc..6ac43ae1b 100644 --- a/lib/gitlab/qa/scenario/test/instance/repository_storage.rb +++ b/lib/gitlab/qa/scenario/test/instance/repository_storage.rb @@ -47,19 +47,20 @@ module Gitlab <<~OMNIBUS external_url 'http://gitlab.test'; - gitlab_rails['repositories_storages'] = { - "default" => { - "gitaly_address" => "tcp://praefect.test:2305", - "gitaly_token" => "PRAEFECT_EXTERNAL_TOKEN" + git_data_dirs({ + 'default' => { + 'gitaly_address' => 'tcp://praefect.test:2305', + 'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN' }, - "gitaly" => { - "gitaly_address" => "tcp://gitlab.test:8075" + 'gitaly' => { + 'gitaly_address' => 'tcp://gitlab.test:8075', + 'path' => '/var/opt/gitlab/git-data/gitaly' }, - "secondary" => { - "gitaly_address" => "tcp://gitlab.test:8075" + 'secondary' => { + 'gitaly_address' => 'tcp://gitlab.test:8075', + 'path' => '/var/opt/gitlab/git-data/secondary' } - }; - + }); gitaly['enable'] = true; gitaly['configuration'] = { auth: { @@ -69,11 +70,11 @@ module Gitlab storage: [ { name: 'gitaly', - path: '/var/opt/gitlab/git-data/gitaly/repositories', + path: '/var/opt/gitlab/git-data/gitaly', }, { name: 'secondary', - path: '/var/opt/gitlab/git-data/secondary/repositories', + path: '/var/opt/gitlab/git-data/secondary', }, ], }; diff --git a/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb b/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb index dd459e58c..dc76a0dc4 100644 --- a/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb +++ b/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb @@ -51,12 +51,12 @@ module Gitlab <<~OMNIBUS external_url 'http://#{config.gitlab_name}.#{config.network}'; - gitlab_rails['repositories_storages'] = { + git_data_dirs({ 'default' => { - 'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}", + 'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}', 'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN' } - }; + }); gitaly['enable'] = false; gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN'; prometheus['scrape_configs'] = [ diff --git a/lib/gitlab/qa/scenario/test/integration/mtls.rb b/lib/gitlab/qa/scenario/test/integration/mtls.rb index ed5e08087..45a9a8189 100644 --- a/lib/gitlab/qa/scenario/test/integration/mtls.rb +++ b/lib/gitlab/qa/scenario/test/integration/mtls.rb @@ -73,14 +73,10 @@ module Gitlab gitlab_rails['gitaly_token'] = 'abc123secret'; gitlab_shell['secret_token'] = 'shellsecret'; - gitlab_rails['repositories_storages'] = { - 'default' => { - 'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999" - }, - 'storage1' => { - 'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999" - } - } + git_data_dirs({ + 'default' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' }, + 'storage1' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' }, + }); OMNIBUS end @@ -122,6 +118,11 @@ 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 3f1b647e5..fb95c0b23 100644 --- a/lib/gitlab/qa/scenario/test/integration/praefect.rb +++ b/lib/gitlab/qa/scenario/test/integration/praefect.rb @@ -19,16 +19,16 @@ module Gitlab <<~OMNIBUS external_url 'http://#{config.gitlab_name}.#{config.network}'; - gitlab_rails['repositories_storages'] = { + git_data_dirs({ 'default' => { - 'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}", + 'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}', 'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN' }, 'gitaly' => { - 'gitaly_address' => "tcp://#{config.gitlab_name}.#{config.network}:8075" + 'gitaly_address' => 'tcp://#{config.gitlab_name}.#{config.network}:8075', + 'path' => '/var/opt/gitlab/git-data' } - } - + }); gitaly['enable'] = true; gitaly['configuration'] = { auth: { diff --git a/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb b/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb index 2db981b12..b761200b4 100644 --- a/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb +++ b/spec/gitlab/qa/runtime/omnibus_configuration_spec.rb @@ -178,18 +178,10 @@ module Gitlab::QA::Runtime it 'method invocations' do omnibusConfiguration.<< <<~OMNIBUS - gitaly['configuration'] = { - storage: [ - { - name: 'default', - path: '/test/default/repositories', - }, - { - name: 'alternative', - path: '/test/alternative/repositories', - } - ], - } + git_data_dirs({ + 'default' => '/test/default', + 'alternative' => '/test/alternative' + }) OMNIBUS expect(omnibusConfiguration.sanitize!.size).to eq(2) -- GitLab From 65ad205db7167b9a11de29309edd08b6d25312a9 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Tue, 20 May 2025 10:37:41 +1000 Subject: [PATCH 2/4] wip --- lib/gitlab/qa/component/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/qa/component/base.rb b/lib/gitlab/qa/component/base.rb index d7afd33cd..ecaf76390 100644 --- a/lib/gitlab/qa/component/base.rb +++ b/lib/gitlab/qa/component/base.rb @@ -200,7 +200,8 @@ module Gitlab wait_until_ready process_exec_commands rescue Support::ShellCommand::StatusError => e - reconfigure_log_file = get_reconfigure_log_file_from_artefact + reconfigure_log_file = nil + reconfigure_log_file = get_reconfigure_log_file_from_artefact if respond_to?(:get_reconfigure_log_file_from_artefact) # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures if (retries += 1) < 3 unless reconfigure_log_file.nil? -- GitLab From 6f0228e2c782f8c433023913ba6d76b5efd08415 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Tue, 20 May 2025 10:56:00 +1000 Subject: [PATCH 3/4] Apply 2 suggestion(s) to 1 file(s) --- lib/gitlab/qa/component/base.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/qa/component/base.rb b/lib/gitlab/qa/component/base.rb index ecaf76390..bc27990f8 100644 --- a/lib/gitlab/qa/component/base.rb +++ b/lib/gitlab/qa/component/base.rb @@ -176,6 +176,10 @@ module Gitlab exec_commands.each { |command| docker.exec(name, command) } end + def get_reconfigure_log_file_from_artefact + nil + end + private attr_reader :exec_commands, :wait_until_ready, :reconfigure @@ -200,8 +204,7 @@ module Gitlab wait_until_ready process_exec_commands rescue Support::ShellCommand::StatusError => e - reconfigure_log_file = nil - reconfigure_log_file = get_reconfigure_log_file_from_artefact if respond_to?(:get_reconfigure_log_file_from_artefact) + reconfigure_log_file = get_reconfigure_log_file_from_artefact # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures if (retries += 1) < 3 unless reconfigure_log_file.nil? -- GitLab From 0326c5b7a39d80632a6bb85276fbcd88d02c9beb Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Tue, 20 May 2025 11:18:43 +1000 Subject: [PATCH 4/4] Edit gitlab.rb --- lib/gitlab/qa/component/gitlab.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/qa/component/gitlab.rb b/lib/gitlab/qa/component/gitlab.rb index f9890cef8..3e3f6b527 100644 --- a/lib/gitlab/qa/component/gitlab.rb +++ b/lib/gitlab/qa/component/gitlab.rb @@ -373,7 +373,7 @@ module Gitlab file << @docker.exec(name, %(gitlab-psql -c 'select * from pg_stat_user_tables;')) end rescue StandardError => e - Runtime::Logger.error("Error getting pg statistics: #{e}") + Runtime::Logger.warn("Error getting pg statistics: #{e}") end class Availability -- GitLab
RetroSearch is an open source project built by @garambo
| Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4