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
4d9c2bad
Commit
4d9c2bad
authored
Jul 04, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix config path
parent
8a0cd7dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
No files found.
app/models/ci/pipeline.rb
View file @
4d9c2bad
...
@@ -331,7 +331,7 @@ module Ci
...
@@ -331,7 +331,7 @@ module Ci
@ci_yaml_file
=
begin
@ci_yaml_file
=
begin
project
.
repository
.
gitlab_ci_yml_for
(
sha
)
project
.
repository
.
gitlab_ci_yml_for
(
sha
)
rescue
Rugged
::
ReferenceError
,
GRPC
::
NotFound
rescue
Rugged
::
ReferenceError
,
GRPC
::
NotFound
,
GRPC
::
Internal
self
.
yaml_errors
=
self
.
yaml_errors
=
"Failed to load CI/CD config file at
#{
project
.
ci_config_file_for_pipeline
}
"
"Failed to load CI/CD config file at
#{
project
.
ci_config_file_for_pipeline
}
"
nil
nil
...
...
app/services/ci/create_pipeline_service.rb
View file @
4d9c2bad
...
@@ -33,7 +33,7 @@ module Ci
...
@@ -33,7 +33,7 @@ module Ci
unless
pipeline
.
config_processor
unless
pipeline
.
config_processor
unless
pipeline
.
ci_yaml_file
unless
pipeline
.
ci_yaml_file
return
error
(
"Missing
#{
p
ipeline
.
ci_yaml_file_path
}
file"
)
return
error
(
"Missing
#{
p
roject
.
ci_config_file_for_pipeline
}
file"
)
end
end
return
error
(
pipeline
.
yaml_errors
,
save:
save_on_errors
)
return
error
(
pipeline
.
yaml_errors
,
save:
save_on_errors
)
end
end
...
...
spec/models/ci/build_spec.rb
View file @
4d9c2bad
...
@@ -1179,7 +1179,7 @@ describe Ci::Build, :models do
...
@@ -1179,7 +1179,7 @@ describe Ci::Build, :models do
{
key:
'CI_PROJECT_NAMESPACE'
,
value:
project
.
namespace
.
full_path
,
public:
true
},
{
key:
'CI_PROJECT_NAMESPACE'
,
value:
project
.
namespace
.
full_path
,
public:
true
},
{
key:
'CI_PROJECT_URL'
,
value:
project
.
web_url
,
public:
true
},
{
key:
'CI_PROJECT_URL'
,
value:
project
.
web_url
,
public:
true
},
{
key:
'CI_PIPELINE_ID'
,
value:
pipeline
.
id
.
to_s
,
public:
true
},
{
key:
'CI_PIPELINE_ID'
,
value:
pipeline
.
id
.
to_s
,
public:
true
},
{
key:
'CI_CONFIG_PATH'
,
value:
p
ipeline
.
ci_yaml_file_path
,
public:
true
},
{
key:
'CI_CONFIG_PATH'
,
value:
p
roject
.
ci_config_file_for_pipeline
,
public:
true
},
{
key:
'CI_REGISTRY_USER'
,
value:
'gitlab-ci-token'
,
public:
true
},
{
key:
'CI_REGISTRY_USER'
,
value:
'gitlab-ci-token'
,
public:
true
},
{
key:
'CI_REGISTRY_PASSWORD'
,
value:
build
.
token
,
public:
false
},
{
key:
'CI_REGISTRY_PASSWORD'
,
value:
build
.
token
,
public:
false
},
{
key:
'CI_REPOSITORY_URL'
,
value:
build
.
repo_url
,
public:
false
}
{
key:
'CI_REPOSITORY_URL'
,
value:
build
.
repo_url
,
public:
false
}
...
...
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