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
Jérome Perrin
gitlab-ce
Commits
a36d5561
Commit
a36d5561
authored
Nov 21, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce deploy command that allows to start deployment from one environment to second one
parent
1d16f137
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
156 additions
and
9 deletions
+156
-9
app/models/environment.rb
app/models/environment.rb
+2
-2
changelogs/unreleased/chatops-deploy-command.yml
changelogs/unreleased/chatops-deploy-command.yml
+4
-0
lib/gitlab/chat_commands/command.rb
lib/gitlab/chat_commands/command.rb
+1
-0
lib/gitlab/chat_commands/deploy.rb
lib/gitlab/chat_commands/deploy.rb
+15
-5
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+6
-0
spec/lib/gitlab/chat_commands/command_spec.rb
spec/lib/gitlab/chat_commands/command_spec.rb
+41
-2
spec/lib/gitlab/chat_commands/deploy_spec.rb
spec/lib/gitlab/chat_commands/deploy_spec.rb
+75
-0
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+12
-0
No files found.
app/models/environment.rb
View file @
a36d5561
...
@@ -103,8 +103,8 @@ class Environment < ActiveRecord::Base
...
@@ -103,8 +103,8 @@ class Environment < ActiveRecord::Base
def
actions_for
(
environment
)
def
actions_for
(
environment
)
return
[]
unless
manual_actions
return
[]
unless
manual_actions
manual_actions
.
select
|
action
|
manual_actions
.
select
do
|
action
|
action
.
expanded_environment_name
=
environment
action
.
expanded_environment_name
=
=
environment
end
end
end
end
end
end
changelogs/unreleased/chatops-deploy-command.yml
0 → 100644
View file @
a36d5561
---
title
:
Add deployment command to ChatOps
merge_request
:
7619
author
:
lib/gitlab/chat_commands/command.rb
View file @
a36d5561
...
@@ -4,6 +4,7 @@ module Gitlab
...
@@ -4,6 +4,7 @@ module Gitlab
COMMANDS
=
[
COMMANDS
=
[
Gitlab
::
ChatCommands
::
IssueShow
,
Gitlab
::
ChatCommands
::
IssueShow
,
Gitlab
::
ChatCommands
::
IssueCreate
,
Gitlab
::
ChatCommands
::
IssueCreate
,
Gitlab
::
ChatCommands
::
Deploy
,
].
freeze
].
freeze
def
execute
def
execute
...
...
lib/gitlab/chat_commands/deploy.rb
View file @
a36d5561
...
@@ -9,6 +9,10 @@ module Gitlab
...
@@ -9,6 +9,10 @@ module Gitlab
'deploy <environment> to <target-environment>'
'deploy <environment> to <target-environment>'
end
end
def
self
.
available?
(
project
)
project
.
builds_enabled?
end
def
self
.
allowed?
(
project
,
user
)
def
self
.
allowed?
(
project
,
user
)
can?
(
user
,
:create_deployment
,
project
)
can?
(
user
,
:create_deployment
,
project
)
end
end
...
@@ -17,11 +21,8 @@ module Gitlab
...
@@ -17,11 +21,8 @@ module Gitlab
from
=
match
[
:from
]
from
=
match
[
:from
]
to
=
match
[
:to
]
to
=
match
[
:to
]
environment
=
project
.
environments
.
find_by
(
name:
from
)
actions
=
find_actions
(
from
,
to
)
return
unless
environment
return
unless
actions
.
present?
actions
=
environment
.
actions_for
(
to
)
return
unless
actions
.
any?
if
actions
.
one?
if
actions
.
one?
actions
.
first
.
play
(
current_user
)
actions
.
first
.
play
(
current_user
)
...
@@ -29,6 +30,15 @@ module Gitlab
...
@@ -29,6 +30,15 @@ module Gitlab
Result
.
new
(
:error
,
'Too many actions defined'
)
Result
.
new
(
:error
,
'Too many actions defined'
)
end
end
end
end
private
def
find_actions
(
from
,
to
)
environment
=
project
.
environments
.
find_by
(
name:
from
)
return
unless
environment
environment
.
actions_for
(
to
).
select
(
&
:starts_environment?
)
end
end
end
end
end
end
end
spec/factories/ci/builds.rb
View file @
a36d5561
...
@@ -55,6 +55,12 @@ FactoryGirl.define do
...
@@ -55,6 +55,12 @@ FactoryGirl.define do
self
.
when
'manual'
self
.
when
'manual'
end
end
trait
:teardown_environment
do
options
do
{
environment:
{
action:
'stop'
}
}
end
end
trait
:allowed_to_fail
do
trait
:allowed_to_fail
do
allow_failure
true
allow_failure
true
end
end
...
...
spec/lib/gitlab/chat_commands/command_spec.rb
View file @
a36d5561
...
@@ -4,9 +4,9 @@ describe Gitlab::ChatCommands::Command, service: true do
...
@@ -4,9 +4,9 @@ describe Gitlab::ChatCommands::Command, service: true do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
describe
'#execute'
do
subject
{
described_class
.
new
(
project
,
user
,
params
).
execute
}
subject
{
described_class
.
new
(
project
,
user
,
params
).
execute
}
describe
'#execute'
do
context
'when no command is available'
do
context
'when no command is available'
do
let
(
:params
)
{
{
text:
'issue show 1'
}
}
let
(
:params
)
{
{
text:
'issue show 1'
}
}
let
(
:project
)
{
create
(
:project
,
has_external_issue_tracker:
true
)
}
let
(
:project
)
{
create
(
:project
,
has_external_issue_tracker:
true
)
}
...
@@ -51,5 +51,44 @@ describe Gitlab::ChatCommands::Command, service: true do
...
@@ -51,5 +51,44 @@ describe Gitlab::ChatCommands::Command, service: true do
expect
(
subject
[
:text
]).
to
match
(
/\/issues\/\d+/
)
expect
(
subject
[
:text
]).
to
match
(
/\/issues\/\d+/
)
end
end
end
end
context
'when trying to do deployment'
do
let
(
:params
)
{
{
text:
'deploy staging to production'
}
}
let!
(
:build
)
{
create
(
:ci_build
,
project:
project
)
}
let!
(
:staging
)
{
create
(
:environment
,
name:
'staging'
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
staging
,
deployable:
build
)
}
let!
(
:manual
)
do
create
(
:ci_build
,
:manual
,
project:
project
,
pipeline:
build
.
pipeline
,
name:
'first'
,
environment:
'production'
)
end
context
'and user can not create deployment'
do
it
'returns action'
do
expect
(
subject
[
:response_type
]).
to
be
(
:ephemeral
)
expect
(
subject
[
:text
]).
to
start_with
(
'Whoops! That action is not allowed'
)
end
end
context
'and user does have deployment permission'
do
before
do
project
.
team
<<
[
user
,
:developer
]
end
it
'returns action'
do
expect
(
subject
[
:text
]).
to
include
(
manual
.
name
)
expect
(
subject
[
:response_type
]).
to
be
(
:in_channel
)
end
context
'when duplicate action exists'
do
let!
(
:manual2
)
do
create
(
:ci_build
,
:manual
,
project:
project
,
pipeline:
build
.
pipeline
,
name:
'second'
,
environment:
'production'
)
end
it
'returns error'
do
expect
(
subject
[
:response_type
]).
to
be
(
:ephemeral
)
expect
(
subject
[
:text
]).
to
include
(
'Too many actions defined'
)
end
end
end
end
end
end
end
end
spec/lib/gitlab/chat_commands/deploy_spec.rb
0 → 100644
View file @
a36d5561
require
'spec_helper'
describe
Gitlab
::
ChatCommands
::
Deploy
,
service:
true
do
describe
'#execute'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:regex_match
)
{
described_class
.
match
(
'deploy staging to production'
)
}
before
do
project
.
team
<<
[
user
,
:master
]
end
subject
do
described_class
.
new
(
project
,
user
).
execute
(
regex_match
)
end
context
'if no environment is defined'
do
it
'returns nil'
do
expect
(
subject
).
to
be_nil
end
end
context
'with environment'
do
let!
(
:staging
)
{
create
(
:environment
,
name:
'staging'
,
project:
project
)
}
let!
(
:build
)
{
create
(
:ci_build
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
staging
,
deployable:
build
)
}
context
'without actions'
do
it
'returns nil'
do
expect
(
subject
).
to
be_nil
end
end
context
'with action'
do
let!
(
:manual1
)
do
create
(
:ci_build
,
:manual
,
project:
project
,
pipeline:
build
.
pipeline
,
name:
'first'
,
environment:
'production'
)
end
it
'returns action'
do
expect
(
subject
).
to
eq
(
manual1
)
end
context
'when duplicate action exists'
do
let!
(
:manual2
)
do
create
(
:ci_build
,
:manual
,
project:
project
,
pipeline:
build
.
pipeline
,
name:
'second'
,
environment:
'production'
)
end
it
'returns error'
do
expect
(
subject
.
message
).
to
eq
(
'Too many actions defined'
)
end
end
context
'when teardown action exists'
do
let!
(
:teardown
)
do
create
(
:ci_build
,
:manual
,
:teardown_environment
,
project:
project
,
pipeline:
build
.
pipeline
,
name:
'teardown'
,
environment:
'production'
)
end
it
'returns error'
do
expect
(
subject
).
to
eq
(
action
)
end
end
end
end
end
describe
'self.match'
do
it
'matches the environment'
do
match
=
described_class
.
match
(
'deploy staging to production'
)
expect
(
match
[
:from
]).
to
eq
(
'staging'
)
expect
(
match
[
:to
]).
to
eq
(
'production'
)
end
end
end
spec/models/environment_spec.rb
View file @
a36d5561
...
@@ -9,6 +9,7 @@ describe Environment, models: true do
...
@@ -9,6 +9,7 @@ describe Environment, models: true do
it
{
is_expected
.
to
delegate_method
(
:last_deployment
).
to
(
:deployments
).
as
(
:last
)
}
it
{
is_expected
.
to
delegate_method
(
:last_deployment
).
to
(
:deployments
).
as
(
:last
)
}
it
{
is_expected
.
to
delegate_method
(
:stop_action
).
to
(
:last_deployment
)
}
it
{
is_expected
.
to
delegate_method
(
:stop_action
).
to
(
:last_deployment
)
}
it
{
is_expected
.
to
delegate_method
(
:manual_actions
).
to
(
:last_deployment
)
}
it
{
is_expected
.
to
validate_presence_of
(
:name
)
}
it
{
is_expected
.
to
validate_presence_of
(
:name
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:name
).
scoped_to
(
:project_id
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:name
).
scoped_to
(
:project_id
)
}
...
@@ -187,4 +188,15 @@ describe Environment, models: true do
...
@@ -187,4 +188,15 @@ describe Environment, models: true do
it
{
is_expected
.
to
be
false
}
it
{
is_expected
.
to
be
false
}
end
end
end
end
describe
'#actions_for'
do
let
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
)
}
let
(
:pipeline
)
{
deployment
.
deployable
.
pipeline
}
let!
(
:review_action
)
{
create
(
:ci_build
,
:manual
,
name:
'review-apps'
,
pipeline:
pipeline
,
environment:
'review/$CI_BUILD_REF_NAME'
)}
let!
(
:production_action
)
{
create
(
:ci_build
,
:manual
,
name:
'production'
,
pipeline:
pipeline
,
environment:
'production'
)}
it
'returns a list of actions with matching environment'
do
expect
(
environment
.
actions_for
(
'review/master'
)).
to
contain_exactly
(
review_action
)
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