Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-26 13:45:36 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-26 13:45:36 +0300
commit326dc7da3bb7e6537095277dc8ee8ae880774b62 (patch)
treea7975f8850f5cef9fc706de3a05a7bbd49f8da82 /lib/gitlab/ci/config
parentae99f74b77fc0f49a9efd5f71119e7de4e313629 (diff)
Check if kubernetes required before creating a job
Diffstat (limited to 'lib/gitlab/ci/config')
-rw-r--r--lib/gitlab/ci/config/entry/policy.rb11
1 files changed, 5 insertions, 6 deletions
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