enable incremental rollout only on premiumincremetal-rollout-feature

5 files changed, 5 insertions, 45 deletions

diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index dc6736dd9cd..aa6ddc30a99 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -29,11 +29,6 @@ class ProjectAutoDevops < ActiveRecord::Base
         variables.append(key: 'AUTO_DEVOPS_DOMAIN',
                          value: domain.presence || instance_domain)
       end
-
-      if manual?
-        variables.append(key: 'STAGING_ENABLED', value: '1')
-        variables.append(key: 'INCREMENTAL_ROLLOUT_ENABLED', value: '1')
-      end
     end
   end
 
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index ab92b757836..027c1f28570 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -30,19 +30,4 @@
                     = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
                   = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
 
-                %label.prepend-top-10
-                  %strong= s_('CICD|Deployment strategy')
-                %p.settings-message.text-center
-                  = s_('CICD|Deployment strategy needs a domain name to work correctly.')
-                .form-check
-                  = form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input'
-                  = form.label :deploy_strategy_continuous, class: 'form-check-label' do
-                    = s_('CICD|Continuous deployment to production')
-                    = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-deploy'), target: '_blank'
-                .form-check
-                  = form.radio_button :deploy_strategy, 'manual', class: 'form-check-input'
-                  = form.label :deploy_strategy_manual, class: 'form-check-label' do
-                    = s_('CICD|Automatic deployment to staging, manual deployment to production')
-                    = link_to icon('question-circle'), help_page_path('ci/environments.md', anchor: 'manually-deploying-to-environments'), target: '_blank'
-
           = f.submit _('Save changes'), class: "btn btn-success prepend-top-15"
diff --git a/changelogs/unreleased/incremetal-rollout-feature.yml b/changelogs/unreleased/incremetal-rollout-feature.yml
new file mode 100644
index 00000000000..d9c6dd5a906
--- /dev/null
+++ b/changelogs/unreleased/incremetal-rollout-feature.yml
@@ -0,0 +1,5 @@
+---
+title: remove incremental rollout configuration options
+merge_request:
+author:
+type: removed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a9c5e45f9fa..1a222e2ede0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1068,21 +1068,9 @@ msgstr ""
 msgid "CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration."
 msgstr ""
 
-msgid "CICD|Automatic deployment to staging, manual deployment to production"
-msgstr ""
-
-msgid "CICD|Continuous deployment to production"
-msgstr ""
-
 msgid "CICD|Default to Auto DevOps pipeline"
 msgstr ""
 
-msgid "CICD|Deployment strategy"
-msgstr ""
-
-msgid "CICD|Deployment strategy needs a domain name to work correctly."
-msgstr ""
-
 msgid "CICD|Jobs"
 msgstr ""
 
diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb
index 797d767465a..7b6e36346d5 100644
--- a/spec/models/project_auto_devops_spec.rb
+++ b/spec/models/project_auto_devops_spec.rb
@@ -69,19 +69,6 @@ describe ProjectAutoDevops do
       end
     end
 
-    context 'when deploy_strategy is manual' do
-      let(:domain) { 'example.com' }
-
-      before do
-        auto_devops.deploy_strategy = 'manual'
-      end
-
-      it do
-        expect(auto_devops.predefined_variables.map { |var| var[:key] })
-          .to include("STAGING_ENABLED", "INCREMENTAL_ROLLOUT_ENABLED")
-      end
-    end
-
     context 'when deploy_strategy is continuous' do
       let(:domain) { 'example.com' }