Merge branch '208268-enable-container-policies-by-default' into 'master'

Container expiration policies enabled by default

See merge request gitlab-org/gitlab!28480

app/helpers/container_expiration_policies_helper.rb

@@ -20,7 +20,7 @@ module ContainerExpirationPoliciesHelper
   def older_than_options
     ContainerExpirationPolicy.older_than_options.map do |key, val|
       { key: key.to_s, label: val }.tap do |base|
-        base[:default] = true if key.to_s == '30d'
+        base[:default] = true if key.to_s == '90d'
       end
     end
   end

changelogs/unreleased/208268-enable-container-policies-by-default.yml

+---
+title: Enable container expiration policies by default for new projects
+merge_request: 28480
+author:
+type: changed

db/migrate/20200331220930_enable_container_expiration_policies_by_default.rb

+# frozen_string_literal: true
+
+class EnableContainerExpirationPoliciesByDefault < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      change_column_default :container_expiration_policies, :enabled, true
+    end
+  end
+
+  def down
+    with_lock_retries do
+      change_column_default :container_expiration_policies, :enabled, false
+    end
+  end
+end

db/structure.sql

@@ -1842,7 +1842,7 @@ CREATE TABLE public.container_expiration_policies (
     cadence character varying(12) DEFAULT '7d'::character varying NOT NULL,
     older_than character varying(12),
     keep_n integer,
-    enabled boolean DEFAULT false NOT NULL
+    enabled boolean DEFAULT true NOT NULL
 );
 
 CREATE TABLE public.container_repositories (
@@ -12926,5 +12926,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200326145443
 20200330074719
 20200330132913
+20200331220930
 \.
 

spec/features/projects/settings/registry_settings_spec.rb

@@ -26,7 +26,6 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
     it 'saves expiration policy submit the form' do
       within '#js-registry-policies' do
         within '.card-body' do
-          find('.gl-toggle-wrapper button:not(.is-disabled)').click
           select('7 days until tags are automatically removed', from: 'Expiration interval:')
           select('Every day', from: 'Expiration schedule:')
           select('50 tags per image name', from: 'Number of tags to retain:')

spec/helpers/container_expiration_policies_helper_spec.rb

@@ -37,8 +37,8 @@ describe ContainerExpirationPoliciesHelper do
       expected_result = [
         { key: '7d', label: '7 days until tags are automatically removed' },
         { key: '14d', label: '14 days until tags are automatically removed' },
-        { key: '30d', label: '30 days until tags are automatically removed', default: true },
-        { key: '90d', label: '90 days until tags are automatically removed' }
+        { key: '30d', label: '30 days until tags are automatically removed' },
+        { key: '90d', label: '90 days until tags are automatically removed', default: true }
       ]
 
       expect(helper.older_than_options).to eq(expected_result)