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
eaf211c2
Commit
eaf211c2
authored
Aug 25, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose compose method in the ci config entry nodes
parent
700078e8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
44 deletions
+47
-44
lib/gitlab/ci/config.rb
lib/gitlab/ci/config.rb
+1
-1
lib/gitlab/ci/config/node/configurable.rb
lib/gitlab/ci/config/node/configurable.rb
+8
-2
lib/gitlab/ci/config/node/entry.rb
lib/gitlab/ci/config/node/entry.rb
+7
-10
lib/gitlab/ci/config/node/global.rb
lib/gitlab/ci/config/node/global.rb
+5
-9
lib/gitlab/ci/config/node/job.rb
lib/gitlab/ci/config/node/job.rb
+10
-10
lib/gitlab/ci/config/node/jobs.rb
lib/gitlab/ci/config/node/jobs.rb
+16
-12
No files found.
lib/gitlab/ci/config.rb
View file @
eaf211c2
...
...
@@ -14,7 +14,7 @@ module Gitlab
@config
=
Loader
.
new
(
config
).
load!
@global
=
Node
::
Global
.
new
(
@config
)
@global
.
process
!
@global
.
compose
!
end
def
valid?
...
...
lib/gitlab/ci/config/node/configurable.rb
View file @
eaf211c2
...
...
@@ -23,9 +23,9 @@ module Gitlab
end
end
private
def
compose!
(
deps
)
return
unless
valid?
def
compose!
(
_deps
)
self
.
class
.
nodes
.
each
do
|
key
,
factory
|
factory
.
value
(
@config
[
key
])
...
...
@@ -33,6 +33,12 @@ module Gitlab
@entries
[
key
]
=
factory
.
create!
end
yield
if
block_given?
@entries
.
each_value
do
|
entry
|
entry
.
compose!
(
deps
)
end
end
class_methods
do
...
...
lib/gitlab/ci/config/node/entry.rb
View file @
eaf211c2
...
...
@@ -20,14 +20,16 @@ module Gitlab
@validator
.
validate
(
:new
)
end
# Temporary method
#
def
process!
(
deps
=
nil
)
return
unless
valid?
compose!
(
deps
)
end
descendants
.
each
do
|
entry
|
entry
.
process!
(
deps
)
end
def
compose!
(
deps
=
nil
)
return
unless
valid?
yield
if
block_given?
end
def
leaf?
...
...
@@ -76,11 +78,6 @@ module Gitlab
def
self
.
validator
Validator
end
private
def
compose!
(
_deps
)
end
end
end
end
...
...
lib/gitlab/ci/config/node/global.rb
View file @
eaf211c2
...
...
@@ -36,19 +36,15 @@ module Gitlab
helpers
:before_script
,
:image
,
:services
,
:after_script
,
:variables
,
:stages
,
:types
,
:cache
,
:jobs
def
process!
(
_deps
=
nil
)
super
(
self
)
def
compose!
(
_deps
=
nil
)
super
(
self
)
do
compose_jobs!
compose_deprecated_entries!
end
end
private
def
compose!
(
_deps
)
super
compose_jobs!
compose_deprecated_entries!
end
def
compose_jobs!
factory
=
Node
::
Factory
.
new
(
Node
::
Jobs
)
.
value
(
@config
.
except
(
*
self
.
class
.
nodes
.
keys
))
...
...
lib/gitlab/ci/config/node/job.rb
View file @
eaf211c2
...
...
@@ -82,6 +82,16 @@ module Gitlab
:cache
,
:image
,
:services
,
:only
,
:except
,
:variables
,
:artifacts
def
compose!
(
deps
)
super
do
if
type_defined?
&&
!
stage_defined?
@entries
[
:stage
]
=
@entries
[
:type
]
end
@entries
.
delete
(
:type
)
end
end
def
name
@metadata
[
:name
]
end
...
...
@@ -106,16 +116,6 @@ module Gitlab
artifacts:
artifacts
,
after_script:
after_script
}
end
def
compose!
(
_deps
)
super
if
type_defined?
&&
!
stage_defined?
@entries
[
:stage
]
=
@entries
[
:type
]
end
@entries
.
delete
(
:type
)
end
end
end
end
...
...
lib/gitlab/ci/config/node/jobs.rb
View file @
eaf211c2
...
...
@@ -26,19 +26,23 @@ module Gitlab
name
.
to_s
.
start_with?
(
'.'
)
end
private
def
compose!
(
_deps
)
@config
.
each
do
|
name
,
config
|
node
=
hidden?
(
name
)
?
Node
::
HiddenJob
:
Node
::
Job
factory
=
Node
::
Factory
.
new
(
node
)
.
value
(
config
||
{})
.
metadata
(
name:
name
)
.
with
(
key:
name
,
parent:
self
,
description:
"
#{
name
}
job definition."
)
def
compose!
(
deps
=
nil
)
super
do
@config
.
each
do
|
name
,
config
|
node
=
hidden?
(
name
)
?
Node
::
HiddenJob
:
Node
::
Job
factory
=
Node
::
Factory
.
new
(
node
)
.
value
(
config
||
{})
.
metadata
(
name:
name
)
.
with
(
key:
name
,
parent:
self
,
description:
"
#{
name
}
job definition."
)
@entries
[
name
]
=
factory
.
create!
end
@entries
[
name
]
=
factory
.
create!
@entries
.
each_value
do
|
entry
|
entry
.
compose!
(
deps
)
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