Commit c9cbc2a1 authored by Markus Koller's avatar Markus Koller

Merge branch 'datadog_ci_integration_public' into 'master'

Remove FF for datadog_ci_integration [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!64113
parents a53f5131 04bd0eaf
...@@ -14,14 +14,14 @@ class Integration < ApplicationRecord ...@@ -14,14 +14,14 @@ class Integration < ApplicationRecord
self.table_name = 'services' self.table_name = 'services'
INTEGRATION_NAMES = %w[ INTEGRATION_NAMES = %w[
asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker discord asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord
drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat irker jira drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat irker jira
mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email
pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack
].freeze ].freeze
PROJECT_SPECIFIC_INTEGRATION_NAMES = %w[ PROJECT_SPECIFIC_INTEGRATION_NAMES = %w[
datadog jenkins jenkins
].freeze ].freeze
# Fake integrations to help with local development. # Fake integrations to help with local development.
......
...@@ -1407,8 +1407,6 @@ class Project < ApplicationRecord ...@@ -1407,8 +1407,6 @@ class Project < ApplicationRecord
end end
def disabled_services def disabled_services
return %w[datadog] unless Feature.enabled?(:datadog_ci_integration, self)
[] []
end end
......
---
name: datadog_ci_integration
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46564
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284088
type: development
group: group::ecosystem
default_enabled: false
milestone: '13.7'
...@@ -32,6 +32,7 @@ Click on the service links to see further configuration instructions and details ...@@ -32,6 +32,7 @@ Click on the service links to see further configuration instructions and details
| Campfire | Connect to chat. | **{dotted-circle}** No | | Campfire | Connect to chat. | **{dotted-circle}** No |
| [Confluence Workspace](../../../api/services.md#confluence-service) | Replace the link to the internal wiki with a link to a Confluence Cloud Workspace. | **{dotted-circle}** No | | [Confluence Workspace](../../../api/services.md#confluence-service) | Replace the link to the internal wiki with a link to a Confluence Cloud Workspace. | **{dotted-circle}** No |
| [Custom issue tracker](custom_issue_tracker.md) | Use a custom issue tracker. | **{dotted-circle}** No | | [Custom issue tracker](custom_issue_tracker.md) | Use a custom issue tracker. | **{dotted-circle}** No |
| Datadog | Trace your GitLab pipelines with Datadog. | **{check-circle}** Yes |
| [Discord Notifications](discord_notifications.md) | Send notifications about project events to a Discord channel. | **{dotted-circle}** No | | [Discord Notifications](discord_notifications.md) | Send notifications about project events to a Discord channel. | **{dotted-circle}** No |
| Drone CI | Run CI/CD pipelines with Drone. | **{check-circle}** Yes | | Drone CI | Run CI/CD pipelines with Drone. | **{check-circle}** Yes |
| [Emails on push](emails_on_push.md) | Send commits and diff of each push by email. | **{dotted-circle}** No | | [Emails on push](emails_on_push.md) | Send commits and diff of each push by email. | **{dotted-circle}** No |
......
...@@ -5870,26 +5870,6 @@ RSpec.describe Project, factory_default: :keep do ...@@ -5870,26 +5870,6 @@ RSpec.describe Project, factory_default: :keep do
end end
end end
describe '#disabled_services' do
subject { build(:project).disabled_services }
context 'without datadog_ci_integration' do
before do
stub_feature_flags(datadog_ci_integration: false)
end
it { is_expected.to include('datadog') }
end
context 'with datadog_ci_integration' do
before do
stub_feature_flags(datadog_ci_integration: true)
end
it { is_expected.not_to include('datadog') }
end
end
describe '#find_or_initialize_service' do describe '#find_or_initialize_service' do
it 'avoids N+1 database queries' do it 'avoids N+1 database queries' do
allow(Integration).to receive(:available_services_names).and_return(%w[prometheus pushover]) allow(Integration).to receive(:available_services_names).and_return(%w[prometheus pushover])
......
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