1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index b1297565ebe..88fa079f30d 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -282,6 +282,10 @@ module Ci
       if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w(on_success on_failure always))
         raise ValidationError, "#{name} job: artifacts:when parameter should be on_success, on_failure or always"
       end
+
+      if job[:artifacts][:expire_in] && !validate_duration(job[:artifacts][:expire_in])
+        raise ValidationError, "#{name} job: artifacts:expire_in parameter should be a duration"
+      end
     end
 
     def validate_job_dependencies!(name, job)
@@ -300,6 +304,12 @@ module Ci
       end
     end
 
+    def validate_duration(value)
+      value.is_a?(String) && ChronicDuration.parse(value)
+    rescue ChronicDuration::DurationParseError
+      false
+    end
+
     def validate_array_of_strings(values)
       values.is_a?(Array) && values.all? { |value| validate_string(value) }
     end