diff options
Diffstat (limited to 'lib/gitlab/ci/build')
-rw-r--r-- | lib/gitlab/ci/build/policy/kubernetes.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/build/policy/refs.rb | 12 | ||||
-rw-r--r-- | lib/gitlab/ci/build/policy/specification.rb | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/gitlab/ci/build/policy/kubernetes.rb b/lib/gitlab/ci/build/policy/kubernetes.rb index bf3a95e08f0..b20d374288f 100644 --- a/lib/gitlab/ci/build/policy/kubernetes.rb +++ b/lib/gitlab/ci/build/policy/kubernetes.rb @@ -9,7 +9,7 @@ module Gitlab end end - def satisfied_by?(pipeline, **_) + def satisfied_by?(pipeline) pipeline.has_kubernetes_active? end end diff --git a/lib/gitlab/ci/build/policy/refs.rb b/lib/gitlab/ci/build/policy/refs.rb index 76a57f041e3..eadc0948d2f 100644 --- a/lib/gitlab/ci/build/policy/refs.rb +++ b/lib/gitlab/ci/build/policy/refs.rb @@ -7,21 +7,21 @@ module Gitlab @patterns = Array(refs) end - def satisfied_by?(pipeline, path: nil) + def satisfied_by?(pipeline) @patterns.any? do |pattern| - pattern, ref_path = pattern.split('@', 2) + pattern, path = pattern.split('@', 2) - matches_path?(ref_path, path) && + matches_path?(path, pipeline) && matches_pattern?(pattern, pipeline) end end private - def matches_path?(ref_path, expected_path) - return true unless ref_path + def matches_path?(path, pipeline) + return true unless path - expected_path == ref_path + pipeline.project_full_path == path end def matches_pattern?(pattern, pipeline) diff --git a/lib/gitlab/ci/build/policy/specification.rb b/lib/gitlab/ci/build/policy/specification.rb index 9ca3582b9b0..c317291f29d 100644 --- a/lib/gitlab/ci/build/policy/specification.rb +++ b/lib/gitlab/ci/build/policy/specification.rb @@ -3,7 +3,7 @@ module Gitlab module Build module Policy ## - # Abstract class that defines an intereface of job policy + # Abstract class that defines an interface of job policy # specification. # # Used for job's only/except policy configuration. @@ -15,7 +15,7 @@ module Gitlab @spec = spec end - def satisfied_by?(pipeline, **metadata) + def satisfied_by?(pipeline) raise NotImplementedError end end |