Commit 057d2d55 authored by Dan Davison's avatar Dan Davison

Merge branch '236195-update-repo-move-e2e-tests' into 'master'

Update tests that check repo move

Closes #236195

See merge request gitlab-org/gitlab!39927
parents 5340e5e0 2d04c023
......@@ -376,7 +376,11 @@ module QA
wait_until_shell_command("docker exec #{@gitlab} bash -c 'tail -n 50 /var/log/gitlab/gitaly/current'") do |line|
log = JSON.parse(line)
break log['grpc.request.repoPath'] if log['grpc.method'] == 'RenameRepository' && log['grpc.request.repoStorage'] == storage && !log['grpc.request.repoPath'].include?('wiki')
if (log['grpc.method'] == 'RenameRepository' || log['grpc.method'] == 'RemoveRepository') &&
log['grpc.request.repoStorage'] == storage &&
!log['grpc.request.repoPath'].include?('wiki')
break log['grpc.request.repoPath']
end
rescue JSON::ParserError
# Ignore lines that can't be parsed as JSON
end
......
......@@ -2,7 +2,7 @@
module QA
RSpec.describe 'Create' do
describe 'Changing Gitaly repository storage', :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/236195', type: :investigating } do
describe 'Changing Gitaly repository storage', :requires_admin do
praefect_manager = Service::PraefectManager.new
praefect_manager.gitlab = 'gitlab'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment