Commit 4ecc8ea9 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'jmd-fix-gitaly-distributed-reads-e2e' into 'master'

Ensuring all gitaly nodes are running prior to e2e

See merge request gitlab-org/gitlab!73592
parents b28e70e2 9047b91d
...@@ -16,9 +16,15 @@ module QA ...@@ -16,9 +16,15 @@ module QA
end end
before do before do
praefect_manager.start_all_nodes
praefect_manager.wait_for_replication(project.id) praefect_manager.wait_for_replication(project.id)
end end
after do
# Leave the cluster in a suitable state for subsequent tests
praefect_manager.start_all_nodes
end
it 'reads from each node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1264' do it 'reads from each node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1264' do
pre_read_data = praefect_manager.query_read_distribution pre_read_data = praefect_manager.query_read_distribution
...@@ -42,9 +48,7 @@ module QA ...@@ -42,9 +48,7 @@ module QA
after do after do
# Leave the cluster in a suitable state for subsequent tests # Leave the cluster in a suitable state for subsequent tests
praefect_manager.start_secondary_node praefect_manager.start_all_nodes
praefect_manager.wait_for_health_check_all_nodes
praefect_manager.wait_for_reliable_connection
end end
it 'does not read from the unhealthy node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1263' do it 'does not read from the unhealthy node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1263' do
......
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