Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2339306d
Commit
2339306d
authored
Aug 31, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve matching kubernetes job in CI/CD processor
parent
9eabd723
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+3
-3
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
2339306d
...
@@ -48,9 +48,9 @@ module Ci
...
@@ -48,9 +48,9 @@ module Ci
only_kubernetes
=
job
.
dig
(
:only
,
:kubernetes
)
only_kubernetes
=
job
.
dig
(
:only
,
:kubernetes
)
except_kubernetes
=
job
.
dig
(
:except
,
:kubernetes
)
except_kubernetes
=
job
.
dig
(
:except
,
:kubernetes
)
[
!
only_kubernetes
&
!
except_kubernetes
,
[
!
only_kubernetes
&
&
!
except_kubernetes
,
only_kubernetes
&
has_kubernetes
,
only_kubernetes
&
&
has_kubernetes
,
except_kubernetes
&
!
has_kubernetes
].
any?
except_kubernetes
&
&
!
has_kubernetes
].
any?
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment