Move except and only job nodes to new CI config

2 files changed, 35 insertions, 1 deletions

diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb
index 1c28969be14..401611def17 100644
--- a/lib/gitlab/ci/config/node/job.rb
+++ b/lib/gitlab/ci/config/node/job.rb
@@ -38,8 +38,14 @@ module Gitlab
           node :services, Services,
             description: 'Services that will be used to execute this job.'
 
+          node :only, While,
+            description: 'Refs policy this job will be executed for.'
+
+          node :except, While,
+            description: 'Refs policy this job will be executed for.'
+
           helpers :before_script, :script, :stage, :type, :after_script,
-                  :cache, :image, :services
+                  :cache, :image, :services, :only, :except
 
           def name
             @metadata[:name]
@@ -59,6 +65,8 @@ module Gitlab
               services: services,
               stage: stage,
               cache: cache,
+              only: only,
+              except: except,
               after_script: after_script }
           end
 
diff --git a/lib/gitlab/ci/config/node/while.rb b/lib/gitlab/ci/config/node/while.rb
new file mode 100644
index 00000000000..84d4352624d
--- /dev/null
+++ b/lib/gitlab/ci/config/node/while.rb
@@ -0,0 +1,26 @@
+module Gitlab
+  module Ci
+    class Config
+      module Node
+        ##
+        # Entry that represents a ref and trigger policy for the job.
+        #
+        class While < Entry
+          include Validatable
+
+          validations do
+            include LegacyValidationHelpers
+
+            validate :array_of_strings_or_regexps
+
+            def array_of_strings_or_regexps
+              unless validate_array_of_strings_or_regexps(config)
+                errors.add(:config, 'should be an array of strings or regexps')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end