1 files changed, 4 insertions, 34 deletions
diff --git a/db/post_migrate/20210413132500_reschedule_artifact_expiry_backfill_again.rb b/db/post_migrate/20210413132500_reschedule_artifact_expiry_backfill_again.rb
index b4570c8398b..0377df7a46b 100644
--- a/db/post_migrate/20210413132500_reschedule_artifact_expiry_backfill_again.rb
+++ b/db/post_migrate/20210413132500_reschedule_artifact_expiry_backfill_again.rb
@@ -1,44 +1,14 @@
 # frozen_string_literal: true
 
 class RescheduleArtifactExpiryBackfillAgain < ActiveRecord::Migration[6.0]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  MIGRATION = 'BackfillArtifactExpiryDate'
-  SWITCH_DATE = Date.new(2020, 06, 22).freeze
-
-  disable_ddl_transaction!
-
-  class JobArtifact < ActiveRecord::Base
-    include EachBatch
-
-    self.inheritance_column = :_type_disabled
-    self.table_name = 'ci_job_artifacts'
-
-    scope :without_expiry_date, -> { where(expire_at: nil) }
-    scope :before_switch, -> { where("date(created_at AT TIME ZONE 'UTC') < ?::date", SWITCH_DATE) }
-  end
+  # This migration has been disabled as it was causing a regression bug for self instances
+  # preventing artifact deletion, see https://gitlab.com/gitlab-org/gitlab/-/issues/355955
 
   def up
-    Gitlab::BackgroundMigration.steal(MIGRATION) do |job|
-      job.delete
-
-      false
-    end
-
-    queue_background_migration_jobs_by_range_at_intervals(
-      JobArtifact.without_expiry_date.before_switch,
-      MIGRATION,
-      2.minutes,
-      batch_size: 200_000
-    )
+    # no-op
   end
 
   def down
-    Gitlab::BackgroundMigration.steal(MIGRATION) do |job|
-      job.delete
-
-      false
-    end
+    # no-op
   end
 end