diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-31 14:56:25 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-31 14:56:25 +0200 |
| commit | ef030709ebffdecdce67f2693d8c54669edfb7a7 (patch) | |
| tree | c1115d74b7aa6c56150e97e05360d1c71e7ac3dc /lib/ci | |
| parent | 92673c2c63c5928279fdb1985357fa8596c97397 (diff) | |
| download | gitlab-ce-ef030709ebffdecdce67f2693d8c54669edfb7a7.tar.gz | |
Change kubernetes job policy allowed values
It is now possible to use `kubernetes: configured`.
Diffstat (limited to 'lib/ci')
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index 5676618f7fd..434b8948f41 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -94,12 +94,11 @@ module Ci except_kubernetes = job.dig(:except, :kubernetes) [!only_kubernetes && !except_kubernetes, - only_kubernetes && has_kubernetes, - except_kubernetes && !has_kubernetes].any? + only_kubernetes && has_kubernetes, + except_kubernetes && !has_kubernetes].any? end end - def jobs_for_ref(ref, tag = false, source = nil) @jobs.select do |_, job| process?(job.dig(:only, :refs), job.dig(:except, :refs), ref, tag, source) |