Commit 0b95b42d authored by Jason Plum's avatar Jason Plum

Merge branch 'fix-duplicate-migrations' into 'master'

Ensure migrations are complete before we run the spec tests

Closes #1095

See merge request charts/gitlab!751
parents 0c0b706b 94ad542a
Pipeline #55443034 passed with stages
in 33 minutes and 49 seconds
......@@ -2,6 +2,9 @@ require 'spec_helper'
describe "Restoring a backup" do
before(:all) do
stdout, status = wait_for_dependencies
fail stdout unless status.success?
wait_until_app_ready
ensure_backups_on_object_storage
stdout, status = restore_from_backup
......
......@@ -112,6 +112,13 @@ module Gitlab
return [stdout, status]
end
def wait_for_dependencies
cmd = full_command("/scripts/wait-for-deps")
stdout, status = Open3.capture2e(cmd)
return [stdout, status]
end
def pod_name
filters = 'app=task-runner'
......
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