Add latest changes from gitlab-org/gitlab@master

3 files changed, 31 insertions, 4 deletions

diff --git a/lib/gitlab/ci/config/entry/default.rb b/lib/gitlab/ci/config/entry/default.rb
index 83127bde6e4..646f06a60a9 100644
--- a/lib/gitlab/ci/config/entry/default.rb
+++ b/lib/gitlab/ci/config/entry/default.rb
@@ -14,7 +14,8 @@ module Gitlab
           include ::Gitlab::Config::Entry::Inheritable
 
           ALLOWED_KEYS = %i[before_script image services
-                            after_script cache interruptible].freeze
+                            after_script cache interruptible
+                            timeout].freeze
 
           validations do
             validates :config, allowed_keys: ALLOWED_KEYS
@@ -44,7 +45,11 @@ module Gitlab
             description: 'Set jobs interruptible default value.',
             inherit: false
 
-          helpers :before_script, :image, :services, :after_script, :cache, :interruptible
+          entry :timeout, Entry::Timeout,
+            description: 'Set jobs default timeout.',
+            inherit: false
+
+          helpers :before_script, :image, :services, :after_script, :cache, :interruptible, :timeout
 
           private
 
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index c75ae87a985..a109265f2a7 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -46,8 +46,6 @@ module Gitlab
                 message: "should be one of: #{ALLOWED_WHEN.join(', ')}"
               }
 
-              validates :timeout, duration: { limit: ChronicDuration.output(Project::MAX_BUILD_TIMEOUT) }
-
               validates :dependencies, array_of_strings: true
               validates :extends, array_of_strings_or_string: true
               validates :rules, array_of_hashes: true
@@ -103,6 +101,10 @@ module Gitlab
             description: 'Set jobs interruptible value.',
             inherit: true
 
+          entry :timeout, Entry::Timeout,
+            description: 'Timeout duration of this job.',
+            inherit: true
+
           entry :only, Entry::Policy,
             description: 'Refs policy this job will be executed for.',
             default: Entry::Policy::DEFAULT_ONLY,
diff --git a/lib/gitlab/ci/config/entry/timeout.rb b/lib/gitlab/ci/config/entry/timeout.rb
new file mode 100644
index 00000000000..0bffa9340de
--- /dev/null
+++ b/lib/gitlab/ci/config/entry/timeout.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    class Config
+      module Entry
+        ##
+        # Entry that represents the interrutible value.
+        #
+        class Timeout < ::Gitlab::Config::Entry::Node
+          include ::Gitlab::Config::Entry::Validatable
+
+          validations do
+            validates :config, duration: { limit: ChronicDuration.output(Project::MAX_BUILD_TIMEOUT) }
+          end
+        end
+      end
+    end
+  end
+end