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
3e190d80
Commit
3e190d80
authored
May 25, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests for adding environment_url
parent
cafe62b8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
app/services/ci/retry_build_service.rb
app/services/ci/retry_build_service.rb
+2
-2
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+3
-1
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+7
-0
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+1
-0
No files found.
app/services/ci/retry_build_service.rb
View file @
3e190d80
...
...
@@ -2,8 +2,8 @@ module Ci
class
RetryBuildService
<
::
BaseService
CLONE_ACCESSORS
=
%i[pipeline project ref tag options commands name
allow_failure stage stage_idx trigger_request
yaml_variables when environment
coverage_regex
description tag_list]
.
freeze
yaml_variables when environment
environment_url
coverage_regex
description tag_list]
.
freeze
def
execute
(
build
)
reprocess!
(
build
).
tap
do
|
new_build
|
...
...
spec/factories/ci/builds.rb
View file @
3e190d80
...
...
@@ -63,8 +63,10 @@ FactoryGirl.define do
trait
:teardown_environment
do
environment
'staging'
environment_url
'http://staging.example.com/$CI_JOB_NAME'
options
environment:
{
name:
'staging'
,
action:
'stop'
}
action:
'stop'
,
url:
'http://staging.example.com/$CI_JOB_NAME'
}
end
trait
:allowed_to_fail
do
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
3e190d80
...
...
@@ -105,6 +105,7 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
@@ -523,6 +524,7 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
@@ -552,6 +554,7 @@ module Ci
allow_failure:
false
,
when:
"on_success"
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
@@ -798,6 +801,7 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
@@ -1001,6 +1005,7 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
@@ -1047,6 +1052,7 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
expect
(
subject
.
second
).
to
eq
({
...
...
@@ -1060,6 +1066,7 @@ module Ci
when:
"on_success"
,
allow_failure:
false
,
environment:
nil
,
environment_url:
nil
,
yaml_variables:
[]
})
end
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
3e190d80
...
...
@@ -224,6 +224,7 @@ CommitStatus:
-
erased_at
-
artifacts_expire_at
-
environment
-
environment_url
-
artifacts_size
-
when
-
yaml_variables
...
...
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