Disable support for legacy artifacts

2 files changed, 14 insertions, 7 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 91af564c5e0..996fd34d5c4 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -83,8 +83,12 @@ module Ci
     scope :unstarted, ->() { where(runner_id: nil) }
     scope :ignore_failures, ->() { where(allow_failure: false) }
     scope :with_artifacts_archive, ->() do
-      where('(artifacts_file IS NOT NULL AND artifacts_file <> ?) OR EXISTS (?)',
-        '', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').archive)
+      if Feature.enabled?(:ci_enable_legacy_artifacts)
+        where('(artifacts_file IS NOT NULL AND artifacts_file <> ?) OR EXISTS (?)',
+          '', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').archive)
+      else
+        where('EXISTS (?)', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').archive)
+      end
     end
 
     scope :with_existing_job_artifacts, ->(query) do
diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index cbd63ba8876..b6add212455 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -5,11 +5,13 @@
 # Meant to be prepended so the interface can stay the same
 module ArtifactMigratable
   def artifacts_file
-    job_artifacts_archive&.file || legacy_artifacts_file
+    job_artifacts_archive&.file ||
+      Feature.enabled?(:ci_enable_legacy_artifacts) && legacy_artifacts_file
   end
 
   def artifacts_metadata
-    job_artifacts_metadata&.file || legacy_artifacts_metadata
+    job_artifacts_metadata&.file ||
+      Feature.enabled?(:ci_enable_legacy_artifacts) && legacy_artifacts_metadata
   end
 
   def artifacts?
@@ -21,13 +23,14 @@ module ArtifactMigratable
   end
 
   def artifacts_file_changed?
-    job_artifacts_archive&.file_changed? || attribute_changed?(:artifacts_file)
+    job_artifacts_archive&.file_changed? ||
+      Feature.enabled?(:ci_enable_legacy_artifacts) && attribute_changed?(:artifacts_file)
   end
 
   def remove_artifacts_file!
     if job_artifacts_archive
       job_artifacts_archive.destroy
-    else
+    elsif Feature.enabled?(:ci_enable_legacy_artifacts)
       remove_legacy_artifacts_file!
     end
   end
@@ -35,7 +38,7 @@ module ArtifactMigratable
   def remove_artifacts_metadata!
     if job_artifacts_metadata
       job_artifacts_metadata.destroy
-    else
+    elsif Feature.enabled?(:ci_enable_legacy_artifacts)
       remove_legacy_artifacts_metadata!
     end
   end