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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7d0fe1f0
Commit
7d0fe1f0
authored
Jul 16, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add implementation of manual actions
parent
4e898b9b
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
96 additions
and
17 deletions
+96
-17
app/controllers/projects/builds_controller.rb
app/controllers/projects/builds_controller.rb
+9
-0
app/models/ci/build.rb
app/models/ci/build.rb
+24
-0
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+4
-0
app/models/deployment.rb
app/models/deployment.rb
+4
-0
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+10
-3
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+23
-11
app/views/projects/deployments/_deployment.html.haml
app/views/projects/deployments/_deployment.html.haml
+2
-0
app/views/projects/deployments/_playable.html.haml
app/views/projects/deployments/_playable.html.haml
+12
-0
app/views/projects/environments/_environment.html.haml
app/views/projects/environments/_environment.html.haml
+4
-0
config/routes.rb
config/routes.rb
+1
-0
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+2
-2
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+1
-1
No files found.
app/controllers/projects/builds_controller.rb
View file @
7d0fe1f0
...
@@ -57,6 +57,15 @@ class Projects::BuildsController < Projects::ApplicationController
...
@@ -57,6 +57,15 @@ class Projects::BuildsController < Projects::ApplicationController
redirect_to
build_path
(
build
)
redirect_to
build_path
(
build
)
end
end
def
play
unless
@build
.
playable?
return
render_404
end
build
=
@build
.
play
(
current_user
)
redirect_to
build_path
(
build
)
end
def
cancel
def
cancel
@build
.
cancel
@build
.
cancel
redirect_to
build_path
(
@build
)
redirect_to
build_path
(
@build
)
...
...
app/models/ci/build.rb
View file @
7d0fe1f0
...
@@ -15,6 +15,7 @@ module Ci
...
@@ -15,6 +15,7 @@ module Ci
scope
:with_artifacts
,
->
()
{
where
.
not
(
artifacts_file:
nil
)
}
scope
:with_artifacts
,
->
()
{
where
.
not
(
artifacts_file:
nil
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
).
without_created
}
mount_uploader
:artifacts_file
,
ArtifactUploader
mount_uploader
:artifacts_file
,
ArtifactUploader
mount_uploader
:artifacts_metadata
,
ArtifactUploader
mount_uploader
:artifacts_metadata
,
ArtifactUploader
...
@@ -91,6 +92,29 @@ module Ci
...
@@ -91,6 +92,29 @@ module Ci
end
end
end
end
def
manual?
self
.
when
==
'manual'
end
def
playable_actions
pipeline
.
playable_actions
end
def
playable?
project
.
builds_enabled?
&&
commands
.
present?
&&
manual?
end
def
play
(
current_user
=
nil
)
if
skipped?
# We can run skipped build
new_build
.
user
=
current_user
new_build
.
queue
else
# Otherwise we need to create a duplicate
Ci
::
Build
.
retry
(
self
,
current_user
)
end
end
def
retryable?
def
retryable?
project
.
builds_enabled?
&&
commands
.
present?
&&
complete?
project
.
builds_enabled?
&&
commands
.
present?
&&
complete?
end
end
...
...
app/models/ci/pipeline.rb
View file @
7d0fe1f0
...
@@ -65,6 +65,10 @@ module Ci
...
@@ -65,6 +65,10 @@ module Ci
!
tag?
!
tag?
end
end
def
playable_actions
builds
.
manual_actions
.
latest
end
def
retryable?
def
retryable?
builds
.
latest
.
any?
do
|
build
|
builds
.
latest
.
any?
do
|
build
|
build
.
failed?
&&
build
.
retryable?
build
.
failed?
&&
build
.
retryable?
...
...
app/models/deployment.rb
View file @
7d0fe1f0
...
@@ -32,4 +32,8 @@ class Deployment < ActiveRecord::Base
...
@@ -32,4 +32,8 @@ class Deployment < ActiveRecord::Base
def
keep_around_commit
def
keep_around_commit
project
.
repository
.
keep_around
(
self
.
sha
)
project
.
repository
.
keep_around
(
self
.
sha
)
end
end
def
playable_actions
deployable
.
try
(
:playable_actions
)
end
end
end
app/views/projects/ci/builds/_build.html.haml
View file @
7d0fe1f0
...
@@ -39,6 +39,8 @@
...
@@ -39,6 +39,8 @@
%span
.label.label-danger
allowed to fail
%span
.label.label-danger
allowed to fail
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
%span
.label.label-warning
retried
%span
.label.label-warning
retried
-
if
build
.
manual?
%span
.label.label-info
manual
-
if
defined?
(
runner
)
&&
runner
-
if
defined?
(
runner
)
&&
runner
...
@@ -79,6 +81,11 @@
...
@@ -79,6 +81,11 @@
-
if
build
.
active?
-
if
build
.
active?
=
link_to
cancel_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
=
link_to
cancel_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
=
icon
(
'remove'
,
class:
'cred'
)
=
icon
(
'remove'
,
class:
'cred'
)
-
elsif
defined?
(
allow_retry
)
&&
allow_retry
&&
build
.
retryable?
-
elsif
defined?
(
allow_retry
)
&&
allow_retry
-
if
build
.
retryable?
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
icon
(
'repeat'
)
=
icon
(
'repeat'
)
-
elsif
build
.
playable?
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
icon
(
'play'
)
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
7d0fe1f0
...
@@ -57,8 +57,20 @@
...
@@ -57,8 +57,20 @@
%td
.pipeline-actions
%td
.pipeline-actions
.controls.hidden-xs.pull-right
.controls.hidden-xs.pull-right
-
artifacts
=
pipeline
.
builds
.
latest
.
select
{
|
b
|
b
.
artifacts?
}
-
artifacts
=
pipeline
.
builds
.
latest
.
select
{
|
b
|
b
.
artifacts?
}
-
playable
=
pipeline
.
playable_actions
-
if
artifacts
.
present?
||
playable
.
any?
.btn-group.inline
-
if
playable
.
any?
.btn-group
%a
.dropdown-toggle.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"play"
)
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
play_namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
),
rel:
'nofollow'
do
=
icon
(
"play"
)
%span
=
playable
.
name
.
titleize
-
if
artifacts
.
present?
-
if
artifacts
.
present?
.inline
.btn-group
.btn-group
%a
.dropdown-toggle.btn.btn-default.build-artifacts
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%a
.dropdown-toggle.btn.btn-default.build-artifacts
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"download"
)
=
icon
(
"download"
)
...
...
app/views/projects/deployments/_deployment.html.haml
View file @
7d0fe1f0
...
@@ -21,3 +21,5 @@
...
@@ -21,3 +21,5 @@
Retry
Retry
-
else
-
else
Rollback
Rollback
=
render
'playable'
,
deployment:
deployment
app/views/projects/deployments/_playable.html.haml
0 → 100644
View file @
7d0fe1f0
-
playable
=
deployment
.
playable_actions
-
if
playable
.
any?
.btn-group.inline
.btn-group
%a
.dropdown-toggle.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"play"
)
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
play_namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
),
rel:
'nofollow'
do
=
icon
(
"play"
)
%span
=
playable
.
name
.
titleize
app/views/projects/environments/_environment.html.haml
View file @
7d0fe1f0
...
@@ -15,3 +15,7 @@
...
@@ -15,3 +15,7 @@
%td
%td
-
if
last_deployment
-
if
last_deployment
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
)
}
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
)
}
%td
-
if
can?
(
current_user
,
:create_deployment
,
last_deployment
)
&&
last_deployment
.
deployable
=
render
'projects/deployments/playable'
,
deployment:
last_deployment
config/routes.rb
View file @
7d0fe1f0
...
@@ -750,6 +750,7 @@ Rails.application.routes.draw do
...
@@ -750,6 +750,7 @@ Rails.application.routes.draw do
get
:status
get
:status
post
:cancel
post
:cancel
post
:retry
post
:retry
post
:play
post
:erase
post
:erase
get
:trace
get
:trace
get
:raw
get
:raw
...
...
lib/ci/gitlab_ci_yaml_processor.rb
View file @
7d0fe1f0
...
@@ -194,8 +194,8 @@ module Ci
...
@@ -194,8 +194,8 @@ module Ci
raise
ValidationError
,
"
#{
name
}
job: allow_failure parameter should be an boolean"
raise
ValidationError
,
"
#{
name
}
job: allow_failure parameter should be an boolean"
end
end
if
job
[
:when
]
&&
!
job
[
:when
].
in?
(
%w[on_success on_failure always]
)
if
job
[
:when
]
&&
!
job
[
:when
].
in?
(
%w[on_success on_failure always
manual
]
)
raise
ValidationError
,
"
#{
name
}
job: when parameter should be on_success, on_failure
or always
"
raise
ValidationError
,
"
#{
name
}
job: when parameter should be on_success, on_failure
, always or manual
"
end
end
if
job
[
:environment
]
&&
!
validate_environment
(
job
[
:environment
])
if
job
[
:environment
]
&&
!
validate_environment
(
job
[
:environment
])
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
7d0fe1f0
...
@@ -1141,7 +1141,7 @@ EOT
...
@@ -1141,7 +1141,7 @@ EOT
config
=
YAML
.
dump
({
rspec:
{
script:
"test"
,
when:
1
}
})
config
=
YAML
.
dump
({
rspec:
{
script:
"test"
,
when:
1
}
})
expect
do
expect
do
GitlabCiYamlProcessor
.
new
(
config
,
path
)
GitlabCiYamlProcessor
.
new
(
config
,
path
)
end
.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
,
"rspec job: when parameter should be on_success, on_failure
or always
"
)
end
.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
,
"rspec job: when parameter should be on_success, on_failure
, always or manual
"
)
end
end
it
"returns errors if job artifacts:name is not an a string"
do
it
"returns errors if job artifacts:name is not an a string"
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