summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-31 13:48:42 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-31 13:48:42 +0200
commit2339306df6e642dfb2c8423e69a1f67a064a2119 (patch)
tree700a371365359e1d8a1c262204e7a60b3cd87280
parent9eabd7230da59708981a9ab5f176beaf97aa6923 (diff)
downloadgitlab-ce-2339306df6e642dfb2c8423e69a1f67a064a2119.tar.gz
Improve matching kubernetes job in CI/CD processor
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index e767ffd2211..8dff879018f 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -48,9 +48,9 @@ module Ci
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?
+ [!only_kubernetes && !except_kubernetes,
+ only_kubernetes && has_kubernetes,
+ except_kubernetes && !has_kubernetes].any?
end
end