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
9147a5f8
Commit
9147a5f8
authored
Mar 01, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for checking attributes in build policies
parent
42b2abbe
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
17 deletions
+26
-17
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/expression/statement.rb
lib/gitlab/ci/pipeline/expression/statement.rb
+7
-1
lib/gitlab/ci/yaml_processor.rb
lib/gitlab/ci/yaml_processor.rb
+8
-6
spec/lib/gitlab/ci/build/policy/variables_spec.rb
spec/lib/gitlab/ci/build/policy/variables_spec.rb
+6
-5
No files found.
lib/gitlab/ci/build/policy/kubernetes.rb
View file @
9147a5f8
...
@@ -9,7 +9,7 @@ module Gitlab
...
@@ -9,7 +9,7 @@ module Gitlab
end
end
end
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
_attributes
=
nil
)
pipeline
.
has_kubernetes_active?
pipeline
.
has_kubernetes_active?
end
end
end
end
...
...
lib/gitlab/ci/build/policy/refs.rb
View file @
9147a5f8
...
@@ -7,7 +7,7 @@ module Gitlab
...
@@ -7,7 +7,7 @@ module Gitlab
@patterns
=
Array
(
refs
)
@patterns
=
Array
(
refs
)
end
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
_attributes
=
nil
)
@patterns
.
any?
do
|
pattern
|
@patterns
.
any?
do
|
pattern
|
pattern
,
path
=
pattern
.
split
(
'@'
,
2
)
pattern
,
path
=
pattern
.
split
(
'@'
,
2
)
...
...
lib/gitlab/ci/build/policy/specification.rb
View file @
9147a5f8
...
@@ -15,7 +15,7 @@ module Gitlab
...
@@ -15,7 +15,7 @@ module Gitlab
@spec
=
spec
@spec
=
spec
end
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
attributes
=
nil
)
raise
NotImplementedError
raise
NotImplementedError
end
end
end
end
...
...
lib/gitlab/ci/build/policy/variables.rb
View file @
9147a5f8
...
@@ -7,13 +7,13 @@ module Gitlab
...
@@ -7,13 +7,13 @@ module Gitlab
@expressions
=
Array
(
expressions
)
@expressions
=
Array
(
expressions
)
end
end
def
satisfied_by?
(
pipeline
)
def
satisfied_by?
(
pipeline
,
attributes
)
statements
=
@expressions
.
map
do
|
statement
|
statements
=
@expressions
.
map
do
|
statement
|
::
Gitlab
::
Ci
::
Pipeline
::
Expression
::
Statement
::
Gitlab
::
Ci
::
Pipeline
::
Expression
::
Statement
.
new
(
statement
,
pipeline
)
.
new
(
statement
,
pipeline
)
end
end
statements
.
any?
{
|
statement
|
statement
.
truthful?
}
statements
.
any?
(
&
:truthful?
)
end
end
end
end
end
end
...
...
lib/gitlab/ci/pipeline/expression/statement.rb
View file @
9147a5f8
...
@@ -19,7 +19,13 @@ module Gitlab
...
@@ -19,7 +19,13 @@ module Gitlab
return
if
pipeline
.
nil?
return
if
pipeline
.
nil?
@variables
=
pipeline
.
variables
.
map
do
|
variable
|
# temporary refactoring stubs
#
@variables
=
pipeline
.
project
.
predefined_variables
.
map
do
|
variable
|
[
variable
.
fetch
(
:key
),
variable
.
fetch
(
:value
)]
end
@variables
+=
pipeline
.
variables
.
map
do
|
variable
|
[
variable
.
key
,
variable
.
value
]
[
variable
.
key
,
variable
.
value
]
end
end
...
...
lib/gitlab/ci/yaml_processor.rb
View file @
9147a5f8
...
@@ -54,19 +54,21 @@ module Gitlab
...
@@ -54,19 +54,21 @@ module Gitlab
end
end
def
pipeline_stage_builds
(
stage
,
pipeline
)
def
pipeline_stage_builds
(
stage
,
pipeline
)
selected_jobs
=
@jobs
.
select
do
|
_
,
job
|
builds_attributes
=
@jobs
.
map
do
|
job
|
next
unless
job
[
:stage
]
==
stage
build_attributes
(
job
[
:name
])
end
builds_attributes
.
select
do
|
_
,
attributes
|
next
unless
build
[
:stage
]
==
stage
only_specs
=
Gitlab
::
Ci
::
Build
::
Policy
only_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
job
.
fetch
(
:only
,
{}))
.
fabricate
(
job
.
fetch
(
:only
,
{}))
except_specs
=
Gitlab
::
Ci
::
Build
::
Policy
except_specs
=
Gitlab
::
Ci
::
Build
::
Policy
.
fabricate
(
job
.
fetch
(
:except
,
{}))
.
fabricate
(
job
.
fetch
(
:except
,
{}))
only_specs
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
)
}
&&
only_specs
.
all?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
,
attributes
)
}
&&
except_specs
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
)
}
except_specs
.
none?
{
|
spec
|
spec
.
satisfied_by?
(
pipeline
,
attributes
)
}
end
end
selected_jobs
.
map
{
|
_
,
job
|
build_attributes
(
job
[
:name
])
}
end
end
def
stage_seeds
(
pipeline
)
def
stage_seeds
(
pipeline
)
...
...
spec/lib/gitlab/ci/build/policy/variables_spec.rb
View file @
9147a5f8
...
@@ -2,6 +2,7 @@ require 'spec_helper'
...
@@ -2,6 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
Ci
::
Build
::
Policy
::
Variables
do
describe
Gitlab
::
Ci
::
Build
::
Policy
::
Variables
do
let
(
:pipeline
)
{
build
(
:ci_pipeline
,
ref:
'master'
)
}
let
(
:pipeline
)
{
build
(
:ci_pipeline
,
ref:
'master'
)
}
let
(
:attributes
)
{
double
(
:attributes
)
}
before
do
before
do
pipeline
.
variables
.
build
(
key:
'CI_PROJECT_NAME'
,
value:
''
)
pipeline
.
variables
.
build
(
key:
'CI_PROJECT_NAME'
,
value:
''
)
...
@@ -11,31 +12,31 @@ describe Gitlab::Ci::Build::Policy::Variables do
...
@@ -11,31 +12,31 @@ describe Gitlab::Ci::Build::Policy::Variables do
it
'is satisfied by a defined and existing variable'
do
it
'is satisfied by a defined and existing variable'
do
policy
=
described_class
.
new
([
'$CI_PROJECT_ID'
,
'$UNDEFINED'
])
policy
=
described_class
.
new
([
'$CI_PROJECT_ID'
,
'$UNDEFINED'
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
it
'is not satisfied by an overriden empty variable'
do
it
'is not satisfied by an overriden empty variable'
do
policy
=
described_class
.
new
([
'$CI_PROJECT_NAME'
])
policy
=
described_class
.
new
([
'$CI_PROJECT_NAME'
])
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
it
'is satisfied by a truthy pipeline expression'
do
it
'is satisfied by a truthy pipeline expression'
do
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "#{pipeline.source}")
])
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "#{pipeline.source}")
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
it
'is not satisfied by a falsy pipeline expression'
do
it
'is not satisfied by a falsy pipeline expression'
do
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "invalid source")
])
policy
=
described_class
.
new
([
%($CI_PIPELINE_SOURCE == "invalid source")
])
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
it
'is satisfied by a truthy expression using undefined variable'
do
it
'is satisfied by a truthy expression using undefined variable'
do
policy
=
described_class
.
new
([
'$UNDEFINED'
,
'$UNDEFINED == null'
])
policy
=
described_class
.
new
([
'$UNDEFINED'
,
'$UNDEFINED == null'
])
expect
(
policy
).
to
be_satisfied_by
(
pipeline
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
attributes
)
end
end
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