Commit 442a9482 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'remove-deployments_archive-feature-flag' into 'master'

Remove deployments_archive feature flag

See merge request gitlab-org/gitlab!77490
parents e6c9839d 616cfcc6
...@@ -107,10 +107,7 @@ class Deployment < ApplicationRecord ...@@ -107,10 +107,7 @@ class Deployment < ApplicationRecord
deployment.run_after_commit do deployment.run_after_commit do
Deployments::UpdateEnvironmentWorker.perform_async(id) Deployments::UpdateEnvironmentWorker.perform_async(id)
Deployments::LinkMergeRequestWorker.perform_async(id) Deployments::LinkMergeRequestWorker.perform_async(id)
Deployments::ArchiveInProjectWorker.perform_async(deployment.project_id)
if ::Feature.enabled?(:deployments_archive, deployment.project, default_enabled: :yaml)
Deployments::ArchiveInProjectWorker.perform_async(deployment.project_id)
end
end end
end end
......
...@@ -7,10 +7,6 @@ module Deployments ...@@ -7,10 +7,6 @@ module Deployments
BATCH_SIZE = 100 BATCH_SIZE = 100
def execute def execute
unless ::Feature.enabled?(:deployments_archive, project, default_enabled: :yaml)
return error('Feature flag is not enabled')
end
deployments = Deployment.archivables_in(project, limit: BATCH_SIZE) deployments = Deployment.archivables_in(project, limit: BATCH_SIZE)
return success(result: :empty) if deployments.empty? return success(result: :empty) if deployments.empty?
......
---
name: deployments_archive
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345027
milestone: '14.5'
type: development
group: group::release
default_enabled: true
...@@ -774,10 +774,8 @@ fetch = +refs/environments/*:refs/remotes/origin/environments/* ...@@ -774,10 +774,8 @@ fetch = +refs/environments/*:refs/remotes/origin/environments/*
### Archive Old Deployments ### Archive Old Deployments
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628) in GitLab 14.5. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628) in GitLab 14.5.
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.6. > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345027) in GitLab 14.6.
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628) in GitLab 14.0. [Feature flag `deployments_archive`](https://gitlab.com/gitlab-org/gitlab/-/issues/345027) removed.
FLAG:
On self-managed GitLab, by default this feature is available. To hide the feature per project or for your entire instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `deployments_archive`. On GitLab.com, this feature is available.
When a new deployment happens in your project, When a new deployment happens in your project,
GitLab creates [a special Git-ref to the deployment](#check-out-deployments-locally). GitLab creates [a special Git-ref to the deployment](#check-out-deployments-locally).
......
...@@ -50,17 +50,6 @@ RSpec.describe Deployments::ArchiveInProjectService do ...@@ -50,17 +50,6 @@ RSpec.describe Deployments::ArchiveInProjectService do
end end
end end
context 'when deployments_archive feature flag is disabled' do
before do
stub_feature_flags(deployments_archive: false)
end
it 'does not do anything' do
expect(subject[:status]).to eq(:error)
expect(subject[:message]).to eq('Feature flag is not enabled')
end
end
def deployment_refs_exist? def deployment_refs_exist?
deployment_refs.map { |path| project.repository.ref_exists?(path) } deployment_refs.map { |path| project.repository.ref_exists?(path) }
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