Commit 668aa736 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'remove-latest-feature-flags-in-ci-templates' into 'master'

Remove unnecessary CI tempalte latest redirect feature flags

See merge request gitlab-org/gitlab!71997
parents 80746ab8 7efd2afd
---
name: redirect_to_latest_template_jobs_browser_performance_testing
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url:
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
---
name: redirect_to_latest_template_security_api_fuzzing
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url:
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
---
name: redirect_to_latest_template_security_dast
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url:
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
---
name: redirect_to_latest_template_terraform
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url:
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
---
name: redirect_to_latest_template_verify_browser_performance
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url:
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
...@@ -325,8 +325,14 @@ projects on `gitlab.com`: ...@@ -325,8 +325,14 @@ projects on `gitlab.com`:
After you're confident the latest template can be moved to stable: After you're confident the latest template can be moved to stable:
1. Update the stable template with the content of the latest version. 1. Update the stable template with the content of the latest version.
1. Remove the migration template from `Gitlab::Template::GitlabCiYmlTemplate::TEMPLATES_WITH_LATEST_VERSION` const.
1. Remove the corresponding feature flag. 1. Remove the corresponding feature flag.
NOTE:
Feature flags are enabled by default in RSpec, so all tests are performed
against the latest templates. You should also test the stable templates
with `stub_feature_flags(redirect_to_latest_template_<name>: false)`.
### Further reading ### Further reading
There is an [open issue](https://gitlab.com/gitlab-org/gitlab/-/issues/17716) about There is an [open issue](https://gitlab.com/gitlab-org/gitlab/-/issues/17716) about
......
...@@ -6,9 +6,7 @@ module EE ...@@ -6,9 +6,7 @@ module EE
module GitlabCiYmlTemplate module GitlabCiYmlTemplate
extend ActiveSupport::Concern extend ActiveSupport::Concern
EE_TEMPLATES_WITH_LATEST_VERSION = { EE_TEMPLATES_WITH_LATEST_VERSION = {}.freeze
'Verify/Browser-Performance' => true
}.freeze
class_methods do class_methods do
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
......
...@@ -8,14 +8,6 @@ RSpec.describe "CI YML Templates" do ...@@ -8,14 +8,6 @@ RSpec.describe "CI YML Templates" do
let(:all_templates) { Gitlab::Template::GitlabCiYmlTemplate.all.map(&:full_name) } let(:all_templates) { Gitlab::Template::GitlabCiYmlTemplate.all.map(&:full_name) }
before do
stub_feature_flags(
redirect_to_latest_template_terraform: false,
redirect_to_latest_template_security_dast: false,
redirect_to_latest_template_security_api_fuzzing: false,
redirect_to_latest_template_jobs_browser_performance_testing: false)
end
shared_examples 'require default stages to be included' do shared_examples 'require default stages to be included' do
it 'require default stages to be included' do it 'require default stages to be included' do
expect(subject.stages).to include(*Gitlab::Ci::Config::Entry::Stages.default) expect(subject.stages).to include(*Gitlab::Ci::Config::Entry::Stages.default)
......
...@@ -30,7 +30,6 @@ RSpec.describe 'Verify/Browser-Performance.gitlab-ci.yml' do ...@@ -30,7 +30,6 @@ RSpec.describe 'Verify/Browser-Performance.gitlab-ci.yml' do
before do before do
stub_ci_pipeline_yaml_file(template) stub_ci_pipeline_yaml_file(template)
stub_feature_flags(redirect_to_latest_template_verify_browser_performance: false)
allow_next_instance_of(Ci::BuildScheduleWorker) do |worker| allow_next_instance_of(Ci::BuildScheduleWorker) do |worker|
allow(worker).to receive(:perform).and_return(true) allow(worker).to receive(:perform).and_return(true)
end end
......
...@@ -6,11 +6,7 @@ module Gitlab ...@@ -6,11 +6,7 @@ module Gitlab
BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze
TEMPLATES_WITH_LATEST_VERSION = { TEMPLATES_WITH_LATEST_VERSION = {
'Jobs/Browser-Performance-Testing' => true, 'Jobs/Build' => true
'Jobs/Build' => true,
'Security/API-Fuzzing' => true,
'Security/DAST' => true,
'Terraform' => true
}.freeze }.freeze
def description def description
......
...@@ -13,13 +13,6 @@ RSpec.describe 'CI YML Templates' do ...@@ -13,13 +13,6 @@ RSpec.describe 'CI YML Templates' do
excluded + ["Terraform.gitlab-ci.yml"] excluded + ["Terraform.gitlab-ci.yml"]
end end
before do
stub_feature_flags(
redirect_to_latest_template_terraform: false,
redirect_to_latest_template_security_api_fuzzing: false,
redirect_to_latest_template_security_dast: false)
end
shared_examples 'require default stages to be included' do shared_examples 'require default stages to be included' do
it 'require default stages to be included' do it 'require default stages to be included' do
expect(subject.stages).to include(*Gitlab::Ci::Config::Entry::Stages.default) expect(subject.stages).to include(*Gitlab::Ci::Config::Entry::Stages.default)
......
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