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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b6e4e449
Commit
b6e4e449
authored
Mar 23, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrate build seeds with variables expressions policy
parent
8a2bc9b4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
28 deletions
+29
-28
lib/gitlab/ci/build/policy/kubernetes.rb
lib/gitlab/ci/build/policy/kubernetes.rb
+1
-1
lib/gitlab/ci/build/policy/refs.rb
lib/gitlab/ci/build/policy/refs.rb
+1
-1
lib/gitlab/ci/build/policy/specification.rb
lib/gitlab/ci/build/policy/specification.rb
+1
-1
lib/gitlab/ci/build/policy/variables.rb
lib/gitlab/ci/build/policy/variables.rb
+2
-2
lib/gitlab/ci/pipeline/seed/build.rb
lib/gitlab/ci/pipeline/seed/build.rb
+10
-7
spec/lib/gitlab/ci/yaml_processor_spec.rb
spec/lib/gitlab/ci/yaml_processor_spec.rb
+0
-16
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+14
-0
No files found.
lib/gitlab/ci/build/policy/kubernetes.rb
View file @
b6e4e449
...
...
@@ -9,7 +9,7 @@ module Gitlab
end
end
def
satisfied_by?
(
pipeline
,
_buil
d
=
nil
)
def
satisfied_by?
(
pipeline
,
see
d
=
nil
)
pipeline
.
has_kubernetes_active?
end
end
...
...
lib/gitlab/ci/build/policy/refs.rb
View file @
b6e4e449
...
...
@@ -7,7 +7,7 @@ module Gitlab
@patterns
=
Array
(
refs
)
end
def
satisfied_by?
(
pipeline
,
_buil
d
=
nil
)
def
satisfied_by?
(
pipeline
,
see
d
=
nil
)
@patterns
.
any?
do
|
pattern
|
pattern
,
path
=
pattern
.
split
(
'@'
,
2
)
...
...
lib/gitlab/ci/build/policy/specification.rb
View file @
b6e4e449
...
...
@@ -15,7 +15,7 @@ module Gitlab
@spec
=
spec
end
def
satisfied_by?
(
pipeline
,
buil
d
=
nil
)
def
satisfied_by?
(
pipeline
,
see
d
=
nil
)
raise
NotImplementedError
end
end
...
...
lib/gitlab/ci/build/policy/variables.rb
View file @
b6e4e449
...
...
@@ -7,9 +7,9 @@ module Gitlab
@expressions
=
Array
(
expressions
)
end
def
satisfied_by?
(
pipeline
,
buil
d
)
def
satisfied_by?
(
pipeline
,
see
d
)
variables
=
Gitlab
::
Ci
::
Variables
::
Collection
.
new
(
build
.
simple_variables
)
.
new
(
seed
.
to_resource
.
simple_variables
)
.
to_hash
statements
=
@expressions
.
map
do
|
statement
|
...
...
lib/gitlab/ci/pipeline/seed/build.rb
View file @
b6e4e449
...
...
@@ -11,21 +11,24 @@ module Gitlab
@pipeline
=
pipeline
@attributes
=
attributes
@only
=
attributes
.
delete
(
:only
)
@except
=
attributes
.
delete
(
:except
)
@only
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
attributes
.
delete
(
:only
))
@except
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
attributes
.
delete
(
:except
))
end
# TODO, use pipeline.user ?
#
def
user
=
(
current_user
)
@attributes
.
merge!
(
user:
current_user
)
end
def
included?
# TODO specs for passing a seed object for lazy resource evaluation
#
strong_memoize
(
:inclusion
)
do
only_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
@only
)
except_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
@except
)
only_specs
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
@pipeline
)
}
&&
except_specs
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
@pipeline
)
}
@only
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
@pipeline
,
self
)
}
&&
@except
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
@pipeline
,
self
)
}
end
end
...
...
spec/lib/gitlab/ci/yaml_processor_spec.rb
View file @
b6e4e449
...
...
@@ -182,22 +182,6 @@ module Gitlab
it
'returns stages seed attributes'
do
expect
(
subject
.
stages_attributes
).
to
eq
attributes
end
context
'when variables policy is specified'
do
let
(
:config
)
do
YAML
.
dump
(
unit:
{
script:
'minitest'
,
only:
{
variables:
[
'$CI_PIPELINE_SOURCE'
]
}
},
feature:
{
script:
'spinach'
,
only:
{
variables:
[
'$UNDEFINED'
]
}
})
end
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
it
'returns stage seeds only when variables expression is truthy'
do
seeds
=
subject
.
stage_seeds
(
pipeline
)
expect
(
seeds
.
size
).
to
eq
1
expect
(
seeds
.
first
.
builds
.
dig
(
0
,
:name
)).
to
eq
'unit'
end
end
end
describe
'only / except policies validations'
do
...
...
spec/models/ci/pipeline_spec.rb
View file @
b6e4e449
...
...
@@ -346,6 +346,20 @@ describe Ci::Pipeline, :mailer do
end
end
end
context
'when variables policy is specified'
do
let
(
:config
)
do
{
unit:
{
script:
'minitest'
,
only:
{
variables:
[
'$CI_PIPELINE_SOURCE'
]
}
},
feature:
{
script:
'spinach'
,
only:
{
variables:
[
'$UNDEFINED'
]
}
}
}
end
it
'returns stage seeds only when variables expression is truthy'
do
seeds
=
pipeline
.
stage_seeds
expect
(
seeds
.
size
).
to
eq
1
expect
(
seeds
.
dig
(
0
,
0
,
:name
)).
to
eq
'unit'
end
end
end
describe
'#seeds_size'
do
...
...
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