diff options
Diffstat (limited to 'qa/qa/service')
| -rw-r--r-- | qa/qa/service/docker_run/gitlab_runner.rb | 2 | ||||
| -rw-r--r-- | qa/qa/service/praefect_manager.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/service/docker_run/gitlab_runner.rb b/qa/qa/service/docker_run/gitlab_runner.rb index e15047a0f1d..a5b129eb1f9 100644 --- a/qa/qa/service/docker_run/gitlab_runner.rb +++ b/qa/qa/service/docker_run/gitlab_runner.rb @@ -21,7 +21,7 @@ module QA @name = name || "qa-runner-#{SecureRandom.hex(4)}" @run_untagged = true @executor = :shell - @executor_image = 'registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6' + @executor_image = 'registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.7' super() end diff --git a/qa/qa/service/praefect_manager.rb b/qa/qa/service/praefect_manager.rb index 3a17acbb317..ab4f28c292f 100644 --- a/qa/qa/service/praefect_manager.rb +++ b/qa/qa/service/praefect_manager.rb @@ -206,14 +206,14 @@ module QA def wait_for_new_primary_node(node) QA::Runtime::Logger.info("Wait until #{node} is the primary node") - with_praefect_log do |log| + with_praefect_log(max_duration: 120) do |log| break true if log['msg'] == 'primary node changed' && log['newPrimary'] == node end end def wait_for_new_primary QA::Runtime::Logger.info("Wait until a new primary node is selected") - with_praefect_log do |log| + with_praefect_log(max_duration: 120) do |log| break true if log['msg'] == 'primary node changed' end end @@ -406,8 +406,8 @@ module QA end end - def with_praefect_log - wait_until_shell_command("docker exec #{@praefect} bash -c 'tail -n 1 /var/log/gitlab/praefect/current'") do |line| + def with_praefect_log(**kwargs) + wait_until_shell_command("docker exec #{@praefect} bash -c 'tail -n 1 /var/log/gitlab/praefect/current'", **kwargs) do |line| QA::Runtime::Logger.debug(line.chomp) yield JSON.parse(line) end |