4 files changed, 103 insertions, 3 deletions
diff --git a/lib/gitlab/ci/build/artifacts/expire_in_parser.rb b/lib/gitlab/ci/build/artifacts/expire_in_parser.rb
new file mode 100644
index 00000000000..3e8a1fb86fc
--- /dev/null
+++ b/lib/gitlab/ci/build/artifacts/expire_in_parser.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Build
+      module Artifacts
+        class ExpireInParser
+          def self.validate_duration(value)
+            new(value).validate_duration
+          end
+
+          def initialize(value)
+            @value = value
+          end
+
+          def validate_duration
+            return true if never?
+
+            parse
+          rescue ChronicDuration::DurationParseError
+            false
+          end
+
+          def seconds_from_now
+            parse&.seconds&.from_now
+          end
+
+          private
+
+          attr_reader :value
+
+          def parse
+            return if never?
+
+            ChronicDuration.parse(value)
+          end
+
+          def never?
+            value.to_s.casecmp('never') == 0
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/build/artifacts/metadata/entry.rb b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
index ef354832e8e..355fffbf9c6 100644
--- a/lib/gitlab/ci/build/artifacts/metadata/entry.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
@@ -16,7 +16,7 @@ module Gitlab
           #
           class Entry
             attr_reader :entries
-            attr_accessor :name
+            attr_writer :name
 
             def initialize(path, entries)
               @entries = entries
diff --git a/lib/gitlab/ci/build/auto_retry.rb b/lib/gitlab/ci/build/auto_retry.rb
new file mode 100644
index 00000000000..e6ef12975c2
--- /dev/null
+++ b/lib/gitlab/ci/build/auto_retry.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class Gitlab::Ci::Build::AutoRetry
+  include Gitlab::Utils::StrongMemoize
+
+  DEFAULT_RETRIES = {
+    scheduler_failure: 2
+  }.freeze
+
+  def initialize(build)
+    @build = build
+  end
+
+  def allowed?
+    return false unless @build.retryable?
+
+    within_max_retry_limit?
+  end
+
+  private
+
+  def within_max_retry_limit?
+    max_allowed_retries > 0 && max_allowed_retries > @build.retries_count
+  end
+
+  def max_allowed_retries
+    strong_memoize(:max_allowed_retries) do
+      options_retry_max || DEFAULT_RETRIES.fetch(@build.failure_reason.to_sym, 0)
+    end
+  end
+
+  def options_retry_max
+    Integer(options_retry[:max], exception: false) if retry_on_reason_or_always?
+  end
+
+  def options_retry_when
+    options_retry.fetch(:when, ['always'])
+  end
+
+  def retry_on_reason_or_always?
+    options_retry_when.include?(@build.failure_reason.to_s) ||
+      options_retry_when.include?('always')
+  end
+
+  # The format of the retry option changed in GitLab 11.5: Before it was
+  # integer only, after it is a hash. New builds are created with the new
+  # format, but builds created before GitLab 11.5 and saved in database still
+  # have the old integer only format. This method returns the retry option
+  # normalized as a hash in 11.5+ format.
+  def options_retry
+    strong_memoize(:options_retry) do
+      value = @build.options&.dig(:retry)
+      value = value.is_a?(Integer) ? { max: value } : value.to_h
+      value.with_indifferent_access
+    end
+  end
+end
diff --git a/lib/gitlab/ci/build/step.rb b/lib/gitlab/ci/build/step.rb
index f8550b50905..3f0ccefa9e5 100644
--- a/lib/gitlab/ci/build/step.rb
+++ b/lib/gitlab/ci/build/step.rb
@@ -21,8 +21,6 @@ module Gitlab
           end
 
           def from_release(job)
-            return unless Gitlab::Ci::Features.release_generation_enabled?
-
             release = job.options[:release]
             return unless release