Commit 3341ff0b authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'skip_specs_for_ffs_in_fully_decomposed' into 'master'

Skip specs for flags that do not work for fully decomposed dbs

See merge request gitlab-org/gitlab!80459
parents 40f25a67 9e06457a
...@@ -53,6 +53,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do ...@@ -53,6 +53,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do
context 'with ci_queuing_use_denormalized_data_strategy disabled' do context 'with ci_queuing_use_denormalized_data_strategy disabled' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false) stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false)
end end
...@@ -106,6 +108,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do ...@@ -106,6 +108,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do
context 'with ci_queuing_use_denormalized_data_strategy disabled' do context 'with ci_queuing_use_denormalized_data_strategy disabled' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false) stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false)
end end
...@@ -315,6 +319,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do ...@@ -315,6 +319,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do
context 'when legacy queuing is being used' do context 'when legacy queuing is being used' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_pending_builds_queue_source: false) stub_feature_flags(ci_pending_builds_queue_source: false)
end end
...@@ -342,6 +348,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do ...@@ -342,6 +348,8 @@ RSpec.describe Ci::RegisterJobService, '#execute' do
context 'with ci_queuing_use_denormalized_data_strategy disabled' do context 'with ci_queuing_use_denormalized_data_strategy disabled' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false) stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false)
end end
......
...@@ -4194,6 +4194,8 @@ RSpec.describe User do ...@@ -4194,6 +4194,8 @@ RSpec.describe User do
context 'when FF ci_owned_runners_cross_joins_fix is disabled' do context 'when FF ci_owned_runners_cross_joins_fix is disabled' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_owned_runners_cross_joins_fix: false) stub_feature_flags(ci_owned_runners_cross_joins_fix: false)
end end
......
...@@ -750,6 +750,8 @@ module Ci ...@@ -750,6 +750,8 @@ module Ci
context 'with ci_queuing_use_denormalized_data_strategy disabled' do context 'with ci_queuing_use_denormalized_data_strategy disabled' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false) stub_feature_flags(ci_queuing_use_denormalized_data_strategy: false)
end end
...@@ -773,6 +775,8 @@ module Ci ...@@ -773,6 +775,8 @@ module Ci
context 'when not using pending builds table' do context 'when not using pending builds table' do
before do before do
skip_if_multiple_databases_are_setup
stub_feature_flags(ci_pending_builds_queue_source: false) stub_feature_flags(ci_pending_builds_queue_source: false)
end end
......
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