Merge branch '276479-add-expiration_policy_completed_at-to-container-repositories' into 'master'

Add "expiration_policy_completed_at" support in container repositories

See merge request gitlab-org/gitlab!49924

app/services/container_expiration_policies/cleanup_service.rb

@@ -20,7 +20,8 @@ module ContainerExpirationPolicies
       if result[:status] == :success
         repository.update!(
           expiration_policy_cleanup_status: :cleanup_unscheduled,
-          expiration_policy_started_at: nil
+          expiration_policy_started_at: nil,
+          expiration_policy_completed_at: Time.zone.now
         )
         success(:finished)
       else

changelogs/unreleased/276479-add-expiration_policy_completed_at-to-container-repositories.yml

+---
+title: Add expiration policy completed at support in container repositories
+merge_request: 49924
+author:
+type: added

db/migrate/20201214084105_add_expiration_policy_completed_at_to_container_repositories.rb

+# frozen_string_literal: true
+class AddExpirationPolicyCompletedAtToContainerRepositories < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    add_column(:container_repositories, :expiration_policy_completed_at, :datetime_with_timezone)
+  end
+
+  def down
+    remove_column(:container_repositories, :expiration_policy_completed_at)
+  end
+end

db/schema_migrations/20201214084105

+e991bf621a2eb047903f796256ee65b781e5dd34aff12449f2347480bf7791a7
\ No newline at end of file

db/structure.sql

@@ -11432,7 +11432,8 @@ CREATE TABLE container_repositories (
     updated_at timestamp without time zone NOT NULL,
     status smallint,
     expiration_policy_started_at timestamp with time zone,
-    expiration_policy_cleanup_status smallint DEFAULT 0 NOT NULL
+    expiration_policy_cleanup_status smallint DEFAULT 0 NOT NULL,
+    expiration_policy_completed_at timestamp with time zone
 );
 
 CREATE SEQUENCE container_repositories_id_seq

spec/services/container_expiration_policies/cleanup_service_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe ContainerExpirationPolicies::CleanupService do
           expect(ContainerRepository.waiting_for_cleanup.count).to eq(0)
           expect(repository.reload.cleanup_unscheduled?).to be_truthy
           expect(repository.expiration_policy_started_at).to eq(nil)
+          expect(repository.expiration_policy_completed_at).not_to eq(nil)
         end
       end
     end
@@ -45,6 +46,7 @@ RSpec.describe ContainerExpirationPolicies::CleanupService do
           expect(ContainerRepository.waiting_for_cleanup.count).to eq(1)
           expect(repository.reload.cleanup_unfinished?).to be_truthy
           expect(repository.expiration_policy_started_at).not_to eq(nil)
+          expect(repository.expiration_policy_completed_at).to eq(nil)
         end
       end
     end