Commit 68467582 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'ml-pass-on-reusable-resource-remove-error' into 'master'

Let jobs pass when reusable resource cleanup fails

See merge request gitlab-org/gitlab!83796
parents 96c789e4 873209c6
...@@ -77,7 +77,13 @@ RSpec.configure do |config| ...@@ -77,7 +77,13 @@ RSpec.configure do |config|
# If any tests failed, leave the resources behind to help troubleshoot, otherwise remove them. # If any tests failed, leave the resources behind to help troubleshoot, otherwise remove them.
# Do not remove the shared resource on live environments # Do not remove the shared resource on live environments
QA::Resource::ReusableCollection.remove_all_via_api! if !suite.reporter.failed_examples.present? && !QA::Runtime::Env.running_on_dot_com? begin
QA::Resource::ReusableCollection.remove_all_via_api! if !suite.reporter.failed_examples.present? && !QA::Runtime::Env.running_on_dot_com?
rescue QA::Resource::Errors::InternalServerError => e
# Temporarily prevent this error from failing jobs while the cause is investigated
# See https://gitlab.com/gitlab-org/gitlab/-/issues/354387
QA::Runtime::Logger.debug(e.message)
end
end end
config.append_after(:suite) do config.append_after(:suite) 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