Showing content from https://gitlab.com/gitlab-org/gitlab-qa/-/merge_requests/1425.diff below:
diff --git a/lib/gitlab/qa/component/base.rb b/lib/gitlab/qa/component/base.rb index d7afd33cd5c9d4429a7d7df97566dba79f827e3e..bc27990f8945367124fc1b9d2a0b9efcd3d1f9ec 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 diff --git a/lib/gitlab/qa/component/gitaly.rb b/lib/gitlab/qa/component/gitaly.rb index 53edc009d995a59e8362f42bb06da70a98fbbed8..b704c39d80b0d77f850c95ec83ec0fd81413cf1b 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/component/gitlab.rb b/lib/gitlab/qa/component/gitlab.rb index f9890cef8906dd07714bbcfd9a7481094e07fd56..3e3f6b5271e08d55ec13cac75d219726154a47ba 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 diff --git a/lib/gitlab/qa/scenario/test/instance/airgapped.rb b/lib/gitlab/qa/scenario/test/instance/airgapped.rb index 72304c78087e179dc0e483a5ff7b2d283e698a67..8c3ad172ef95797ee9d0d026d272a3c5f1c79bf1 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 6ae81e7fc193c47761b8e7dde03c48fc4627238e..6ac43ae1bcfafcdd0fed6f2c50f25818b4e3dd8f 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 dd459e58cc91cc2d95d558ae0c8c64167e4e1e0a..dc76a0dc4e9b4c1a143a2106fae3bb2bb488fd00 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 ed5e080879e446b3ae3a88fbbd8af9ef588bf06c..45a9a81890e2e3593721c8c106a8867e82d8e6b9 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 3f1b647e5f26151ffb35e63cbb312e512287c79a..fb95c0b23a705afc84c80cab21c3e96252f8241f 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 2db981b1287f4b8252656e50559d602c548edff1..b761200b4fb64f8c812702f647abedbc029635c1 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)
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