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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
df30aa08
Commit
df30aa08
authored
Nov 06, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create deployments only if action: start
parent
026cc147
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
1 deletion
+29
-1
app/models/concerns/deployable.rb
app/models/concerns/deployable.rb
+1
-1
app/workers/build_success_worker.rb
app/workers/build_success_worker.rb
+7
-0
spec/models/concerns/deployable_spec.rb
spec/models/concerns/deployable_spec.rb
+8
-0
spec/workers/build_success_worker_spec.rb
spec/workers/build_success_worker_spec.rb
+13
-0
No files found.
app/models/concerns/deployable.rb
View file @
df30aa08
...
@@ -7,7 +7,7 @@ module Deployable
...
@@ -7,7 +7,7 @@ module Deployable
after_create
:create_deployment
after_create
:create_deployment
def
create_deployment
def
create_deployment
return
unless
ha
s_environment?
&&
!
has_deployment?
return
unless
start
s_environment?
&&
!
has_deployment?
environment
=
project
.
environments
.
find_or_create_by
(
environment
=
project
.
environments
.
find_or_create_by
(
name:
expanded_environment_name
name:
expanded_environment_name
...
...
app/workers/build_success_worker.rb
View file @
df30aa08
...
@@ -10,6 +10,7 @@ class BuildSuccessWorker
...
@@ -10,6 +10,7 @@ class BuildSuccessWorker
def
perform
(
build_id
)
def
perform
(
build_id
)
Ci
::
Build
.
find_by
(
id:
build_id
).
try
do
|
build
|
Ci
::
Build
.
find_by
(
id:
build_id
).
try
do
|
build
|
create_deployment
(
build
)
if
build
.
has_environment?
create_deployment
(
build
)
if
build
.
has_environment?
stop_environment
(
build
)
if
build
.
stops_environment?
end
end
end
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: enable CodeReuse/ActiveRecord
...
@@ -26,4 +27,10 @@ class BuildSuccessWorker
...
@@ -26,4 +27,10 @@ class BuildSuccessWorker
deployment
.
succeed
deployment
.
succeed
end
end
end
end
##
# TODO: This should be processed in DeploymentSuccessWorker once we started storing `action` value in `deployments` records
def
stop_environment
(
build
)
build
.
persisted_environment
.
stop
end
end
end
spec/models/concerns/deployable_spec.rb
View file @
df30aa08
...
@@ -24,6 +24,14 @@ describe Deployable do
...
@@ -24,6 +24,14 @@ describe Deployable do
end
end
end
end
context
'when the deployable object will stop an environment'
do
let!
(
:job
)
{
create
(
:ci_build
,
:stop_review_app
)
}
it
'does not create a deployment record'
do
expect
(
deployment
).
to
be_nil
end
end
context
'when the deployable object has already had a deployment'
do
context
'when the deployable object has already had a deployment'
do
let!
(
:job
)
{
create
(
:ci_build
,
:start_review_app
,
deployment:
race_deployment
)
}
let!
(
:job
)
{
create
(
:ci_build
,
:start_review_app
,
deployment:
race_deployment
)
}
let!
(
:race_deployment
)
{
create
(
:deployment
,
:success
)
}
let!
(
:race_deployment
)
{
create
(
:deployment
,
:success
)
}
...
...
spec/workers/build_success_worker_spec.rb
View file @
df30aa08
...
@@ -47,6 +47,19 @@ describe BuildSuccessWorker do
...
@@ -47,6 +47,19 @@ describe BuildSuccessWorker do
expect
(
build
.
reload
).
not_to
be_has_deployment
expect
(
build
.
reload
).
not_to
be_has_deployment
end
end
end
end
context
'when the build will stop an environment'
do
let!
(
:build
)
{
create
(
:ci_build
,
:stop_review_app
,
environment:
environment
.
name
,
project:
environment
.
project
)
}
let
(
:environment
)
{
create
(
:environment
,
state: :available
)
}
it
'stops the environment'
do
expect
(
environment
).
to
be_available
subject
expect
(
environment
.
reload
).
to
be_stopped
end
end
end
end
context
'when build does not exist'
do
context
'when build does not exist'
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