Skip to content
Snippets Groups Projects
Unverified Commit 0f8811eb authored by Clemens Beck's avatar Clemens Beck
Browse files

Fix suggested_reviewers run when rails is disabled

The suggested reviewers feature/recipe depends on rails being
enabled. The recipe is now only ran when rails is enabled.

Fixes: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7479

Changelog: fixed
parent 7e83da64
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -44,9 +44,11 @@ end
end
end
 
rails_enable = node['gitlab']['gitlab-rails']['enable']
# Geo secondary
if node['gitlab']['geo-secondary']['enable']
if node['gitlab']['gitlab-rails']['enable']
if rails_enable
include_recipe 'gitlab-ee::geo-secondary'
include_recipe 'gitlab-ee::geo_database_migrations'
end
Loading
Loading
@@ -55,7 +57,7 @@ else
end
 
# Suggested Reviewers
include_recipe 'gitlab-ee::suggested_reviewers'
include_recipe 'gitlab-ee::suggested_reviewers' if rails_enable
 
# Create the pgbouncer users
include_recipe 'pgbouncer::user'
Loading
Loading
@@ -65,4 +65,28 @@ RSpec.describe 'gitlab-ee::suggested_reviwers' do
it_behaves_like 'Create suggested reviewer secrets and notifies services'
end
end
context 'rails configuration' do
before do
stub_gitlab_rb(
gitlab_rails: {
enable: rails_enabled,
}
)
end
context 'is enabled' do
let(:rails_enabled) { true }
it 'does incudes suggested reviewers' do
expect(chef_run).to include_recipe('gitlab-ee::suggested_reviewers')
end
end
context 'is disabled' do
let(:rails_enabled) { false }
it 'does not incudes suggested reviewers' do
expect(chef_run).to_not include_recipe('gitlab-ee::suggested_reviewers')
end
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment