Check if kubernetes required before creating a job

2 files changed, 22 insertions, 8 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 3efd9b3bdac..72a38e97648 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -44,6 +44,22 @@ module Ci
       end
     end
 
+    def pipeline_stage_builds(stage, pipeline)
+      builds = builds_for_stage_and_ref(
+        stage, pipeline.ref, pipeline.tag?, pipeline.source)
+
+      builds.select do |build|
+        job = @jobs[build.fetch(:name).to_sym]
+        has_kubernetes = pipeline.has_kubernetes_available?
+        only_kubernetes = job.dig(:only, :kubernetes)
+        except_kubernetes = job.dig(:except, :kubernetes)
+
+        [!only_kubernetes & !except_kubernetes,
+          only_kubernetes & has_kubernetes,
+          except_kubernetes & !has_kubernetes].any?
+      end
+    end
+
     def builds
       @jobs.map do |name, _|
         build_attributes(name)
@@ -52,8 +68,7 @@ module Ci
 
     def stage_seeds(pipeline)
       seeds = @stages.uniq.map do |stage|
-        builds = builds_for_stage_and_ref(
-          stage, pipeline.ref, pipeline.tag?, pipeline.source)
+        builds = pipeline_stage_builds(stage, pipeline)
 
         Gitlab::Ci::Stage::Seed.new(pipeline, stage, builds) if builds.any?
       end
diff --git a/lib/gitlab/ci/config/entry/policy.rb b/lib/gitlab/ci/config/entry/policy.rb
index bcb76de65b2..a8bba3d3ea4 100644
--- a/lib/gitlab/ci/config/entry/policy.rb
+++ b/lib/gitlab/ci/config/entry/policy.rb
@@ -7,7 +7,7 @@ module Gitlab
         #
         class Policy < Simplifiable
           strategy :RefsPolicy, if: -> (config) { config.is_a?(Array) }
-          strategy :ExpressionsPolicy, if: -> (config) { config.is_a?(Hash) }
+          strategy :ComplexPolicy, if: -> (config) { config.is_a?(Hash) }
 
           class RefsPolicy < Entry::Node
             include Entry::Validatable
@@ -21,20 +21,19 @@ module Gitlab
             end
           end
 
-          class ExpressionsPolicy < Entry::Node
+          class ComplexPolicy < Entry::Node
             include Entry::Validatable
             include Entry::Attributable
 
-            attributes :refs, :expressions
+            attributes :refs, :kubernetes
 
             validations do
               validates :config, presence: true
-              validates :config, allowed_keys: %i[refs expressions]
+              validates :config, allowed_keys: %i[refs kubernetes]
 
               with_options allow_nil: true do
                 validates :refs, array_of_strings_or_regexps: true
-                validates :expressions, type: Array
-                validates :expressions, presence: true
+                validates :kubernetes, inclusion: { in: [true] }
               end
             end
           end