Commit f047a319 authored by Dmitriy Zaporozhets (DZ)'s avatar Dmitriy Zaporozhets (DZ)

Merge branch '327315-remove-ci_wildcard_file_paths' into 'master'

Remove the FF ci_wildcard_file_paths

See merge request gitlab-org/gitlab!67441
parents 94120bc6 4cf9beb4
---
name: ci_wildcard_file_paths
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58999
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327315
milestone: '13.11'
type: development
group: group::pipeline authoring
default_enabled: true
...@@ -467,15 +467,7 @@ Use local includes instead of symbolic links. ...@@ -467,15 +467,7 @@ Use local includes instead of symbolic links.
##### `include:local` with wildcard file paths ##### `include:local` with wildcard file paths
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25921) in GitLab 13.11. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25921) in GitLab 13.11.
> - [Deployed behind a feature flag](../../user/feature_flags.md), disabled by default. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/327315) in GitLab 14.2.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/327315) in GitLab 13.12.
> - Enabled on GitLab.com.
> - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to disable it. **(CORE ONLY)**
There can be
[risks when disabling released features](../../administration/feature_flags.md#risks-when-disabling-released-features).
Refer to this feature's version history for more details.
You can use wildcard paths (`*` and `**`) with `include:local`. You can use wildcard paths (`*` and `**`) with `include:local`.
...@@ -499,23 +491,6 @@ When the pipeline runs, GitLab: ...@@ -499,23 +491,6 @@ When the pipeline runs, GitLab:
include: 'configs/**/*.yml' include: 'configs/**/*.yml'
``` ```
The wildcard file paths feature is under development but ready for production use.
It is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
can opt to disable it.
To enable it:
```ruby
Feature.enable(:ci_wildcard_file_paths)
```
To disable it:
```ruby
Feature.disable(:ci_wildcard_file_paths)
```
#### `include:file` #### `include:file`
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/53903) in GitLab 11.7. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/53903) in GitLab 11.7.
......
...@@ -65,8 +65,6 @@ module Gitlab ...@@ -65,8 +65,6 @@ module Gitlab
end end
def expand_wildcard_paths(location) def expand_wildcard_paths(location)
return location unless ::Feature.enabled?(:ci_wildcard_file_paths, context.project, default_enabled: :yaml)
# We only support local files for wildcard paths # We only support local files for wildcard paths
return location unless location[:local] && location[:local].include?('*') return location unless location[:local] && location[:local].include?('*')
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :requires_admin do RSpec.describe 'Verify' do
describe 'Include local config file paths with wildcard' do describe 'Include local config file paths with wildcard' do
let(:feature_flag) { :ci_wildcard_file_paths }
let(:project) do let(:project) do
Resource::Project.fabricate_via_api! do |project| Resource::Project.fabricate_via_api! do |project|
project.name = 'project-with-pipeline' project.name = 'project-with-pipeline'
...@@ -12,7 +10,6 @@ module QA ...@@ -12,7 +10,6 @@ module QA
end end
before do before do
Runtime::Feature.enable(feature_flag)
Flow::Login.sign_in Flow::Login.sign_in
add_files_to_project add_files_to_project
project.visit! project.visit!
...@@ -20,7 +17,6 @@ module QA ...@@ -20,7 +17,6 @@ module QA
end end
after do after do
Runtime::Feature.disable(feature_flag)
project.remove_via_api! project.remove_via_api!
end end
......
...@@ -347,17 +347,6 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do ...@@ -347,17 +347,6 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper do
expect(subject.map(&:location)).to contain_exactly('myfolder/file1.yml', 'myfolder/file2.yml') expect(subject.map(&:location)).to contain_exactly('myfolder/file1.yml', 'myfolder/file2.yml')
end end
context 'when the FF ci_wildcard_file_paths is disabled' do
before do
stub_feature_flags(ci_wildcard_file_paths: false)
end
it 'cannot find any file returns an error message' do
expect(subject).to contain_exactly(an_instance_of(Gitlab::Ci::Config::External::File::Local))
expect(subject[0].errors).to eq(['Local file `myfolder/*.yml` does not exist!'])
end
end
end end
end end
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