1 files changed, 7 insertions, 15 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index b5e68b55f72..6c90645e997 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -27,7 +27,7 @@ module Ci
       upload_multiple_artifacts: -> (build) { build.publishes_artifacts_reports? },
       refspecs: -> (build) { build.merge_request_ref? },
       artifacts_exclude: -> (build) { build.supports_artifacts_exclude? },
-      release_steps: -> (build) { build.release_steps? }
+      multi_build_steps: -> (build) { build.multi_build_steps? }
     }.freeze
 
     DEFAULT_RETRIES = {
@@ -539,7 +539,6 @@ module Ci
           .concat(job_variables)
           .concat(environment_changed_page_variables)
           .concat(persisted_environment_variables)
-          .concat(deploy_freeze_variables)
           .to_runner_variables
       end
     end
@@ -595,18 +594,6 @@ module Ci
       end
     end
 
-    def deploy_freeze_variables
-      Gitlab::Ci::Variables::Collection.new.tap do |variables|
-        break variables unless freeze_period?
-
-        variables.append(key: 'CI_DEPLOY_FREEZE', value: 'true')
-      end
-    end
-
-    def freeze_period?
-      Ci::FreezePeriodStatus.new(project: project).execute
-    end
-
     def dependency_variables
       return [] if all_dependencies.empty?
 
@@ -801,6 +788,11 @@ module Ci
       has_expiring_artifacts? && job_artifacts_archive.present?
     end
 
+    def self.keep_artifacts!
+      update_all(artifacts_expire_at: nil)
+      Ci::JobArtifact.where(job: self.select(:id)).update_all(expire_at: nil)
+    end
+
     def keep_artifacts!
       self.update(artifacts_expire_at: nil)
       self.job_artifacts.update_all(expire_at: nil)
@@ -885,7 +877,7 @@ module Ci
         Gitlab::Ci::Features.artifacts_exclude_enabled?
     end
 
-    def release_steps?
+    def multi_build_steps?
       options.dig(:release)&.any? &&
         Gitlab::Ci::Features.release_generation_enabled?
     end