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
79e1f33f
Commit
79e1f33f
authored
Sep 27, 2017
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose GitLab features to the CI runner
parent
57094085
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
app/models/ci/build.rb
app/models/ci/build.rb
+4
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-0
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+3
-0
No files found.
app/models/ci/build.rb
View file @
79e1f33f
...
@@ -229,6 +229,10 @@ module Ci
...
@@ -229,6 +229,10 @@ module Ci
variables
variables
end
end
def
features
{
trace_sections:
true
}
end
def
merge_request
def
merge_request
return
@merge_request
if
defined?
(
@merge_request
)
return
@merge_request
if
defined?
(
@merge_request
)
...
...
lib/api/entities.rb
View file @
79e1f33f
...
@@ -1020,6 +1020,7 @@ module API
...
@@ -1020,6 +1020,7 @@ module API
expose
:cache
,
using:
Cache
expose
:cache
,
using:
Cache
expose
:credentials
,
using:
Credentials
expose
:credentials
,
using:
Credentials
expose
:dependencies
,
using:
Dependency
expose
:dependencies
,
using:
Dependency
expose
:features
end
end
end
end
...
...
spec/requests/api/runner_spec.rb
View file @
79e1f33f
...
@@ -360,6 +360,8 @@ describe API::Runner do
...
@@ -360,6 +360,8 @@ describe API::Runner do
'policy'
=>
'pull-push'
}]
'policy'
=>
'pull-push'
}]
end
end
let
(
:expected_features
)
{
{
'trace_sections'
=>
true
}
}
it
'picks a job'
do
it
'picks a job'
do
request_job
info:
{
platform: :darwin
}
request_job
info:
{
platform: :darwin
}
...
@@ -379,6 +381,7 @@ describe API::Runner do
...
@@ -379,6 +381,7 @@ describe API::Runner do
expect
(
json_response
[
'artifacts'
]).
to
eq
(
expected_artifacts
)
expect
(
json_response
[
'artifacts'
]).
to
eq
(
expected_artifacts
)
expect
(
json_response
[
'cache'
]).
to
eq
(
expected_cache
)
expect
(
json_response
[
'cache'
]).
to
eq
(
expected_cache
)
expect
(
json_response
[
'variables'
]).
to
include
(
*
expected_variables
)
expect
(
json_response
[
'variables'
]).
to
include
(
*
expected_variables
)
expect
(
json_response
[
'features'
]).
to
eq
(
expected_features
)
end
end
context
'when job is made for tag'
do
context
'when job is made for tag'
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