Commit 0991dc8c authored by Sanad Liaquat's avatar Sanad Liaquat Committed by Sean McGivern

Reduce number of rspec retries

In both e2e QA tests and unit tests, reduce the number of retires
to 2 (i.e., 1 initial and one retry)
parent 089b9e57
...@@ -4,7 +4,12 @@ include: ...@@ -4,7 +4,12 @@ include:
- local: /lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml - local: /lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml
.dedicated-runner: &dedicated-runner .dedicated-runner: &dedicated-runner
retry: 1 retry:
max: 1 # This is confusing but this means "2 runs at max".
when:
- unknown_failure
- api_failure
- runner_system_failure
tags: tags:
- gitlab-org - gitlab-org
...@@ -1168,4 +1173,3 @@ schedule:review-performance: ...@@ -1168,4 +1173,3 @@ schedule:review-performance:
<<: *review-schedules-only <<: *review-schedules-only
script: script:
- wait_for_job_to_be_done "schedule:review-deploy" - wait_for_job_to_be_done "schedule:review-deploy"
...@@ -34,7 +34,7 @@ RSpec.configure do |config| ...@@ -34,7 +34,7 @@ RSpec.configure do |config|
config.display_try_failure_messages = true config.display_try_failure_messages = true
config.around do |example| config.around do |example|
retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 3 retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
example.run_with_retry retry: retry_times example.run_with_retry retry: retry_times
end end
end end
...@@ -13,7 +13,7 @@ describe 'Blob shortcuts', :js do ...@@ -13,7 +13,7 @@ describe 'Blob shortcuts', :js do
end end
shared_examples "quotes the selected text" do shared_examples "quotes the selected text" do
it "quotes the selected text" do it "quotes the selected text", :quarantine do
select_element('.note-text') select_element('.note-text')
find('body').native.send_key('r') find('body').native.send_key('r')
......
...@@ -63,7 +63,7 @@ describe 'User visits the profile preferences page' do ...@@ -63,7 +63,7 @@ describe 'User visits the profile preferences page' do
end end
describe 'User changes their language', :js do describe 'User changes their language', :js do
it 'creates a flash message' do it 'creates a flash message', :quarantine do
select2('en', from: '#user_preferred_language') select2('en', from: '#user_preferred_language')
click_button 'Save' click_button 'Save'
......
...@@ -615,7 +615,7 @@ module Gitlab ...@@ -615,7 +615,7 @@ module Gitlab
subject { Gitlab::Ci::YamlProcessor.new(YAML.dump(config), opts) } subject { Gitlab::Ci::YamlProcessor.new(YAML.dump(config), opts) }
context "when validating a ci config file with no project context" do context "when validating a ci config file with no project context" do
context "when a single string is provided" do context "when a single string is provided", :quarantine do
let(:include_content) { "/local.gitlab-ci.yml" } let(:include_content) { "/local.gitlab-ci.yml" }
it "does not return any error" do it "does not return any error" do
......
...@@ -100,8 +100,8 @@ RSpec.configure do |config| ...@@ -100,8 +100,8 @@ RSpec.configure do |config|
config.include PolicyHelpers, type: :policy config.include PolicyHelpers, type: :policy
if ENV['CI'] if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing. # This includes the first try, i.e. tests will be run 2 times before failing.
config.default_retry_count = 4 config.default_retry_count = 2
config.reporter.register_listener( config.reporter.register_listener(
RspecFlaky::Listener.new, RspecFlaky::Listener.new,
:example_passed, :example_passed,
......
...@@ -42,7 +42,7 @@ shared_examples 'wiki file attachments' do ...@@ -42,7 +42,7 @@ shared_examples 'wiki file attachments' do
end end
end end
context 'uploading is complete' do context 'uploading is complete', :quarantine do
it 'shows "Attach a file" button on uploading complete' do it 'shows "Attach a file" button on uploading complete' do
attach_with_dropzone attach_with_dropzone
wait_for_requests wait_for_requests
......
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