Commit 4d9c2bad authored by Lin Jen-Shin's avatar Lin Jen-Shin

Fix config path

parent 8a0cd7dd
......@@ -331,7 +331,7 @@ module Ci
@ci_yaml_file = begin
project.repository.gitlab_ci_yml_for(sha)
rescue Rugged::ReferenceError, GRPC::NotFound
rescue Rugged::ReferenceError, GRPC::NotFound, GRPC::Internal
self.yaml_errors =
"Failed to load CI/CD config file at #{project.ci_config_file_for_pipeline}"
nil
......
......@@ -33,7 +33,7 @@ module Ci
unless pipeline.config_processor
unless pipeline.ci_yaml_file
return error("Missing #{pipeline.ci_yaml_file_path} file")
return error("Missing #{project.ci_config_file_for_pipeline} file")
end
return error(pipeline.yaml_errors, save: save_on_errors)
end
......
......@@ -1179,7 +1179,7 @@ describe Ci::Build, :models do
{ key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, 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_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true },
{ key: 'CI_CONFIG_PATH', value: project.ci_config_file_for_pipeline, public: true },
{ key: 'CI_REGISTRY_USER', value: 'gitlab-ci-token', public: true },
{ key: 'CI_REGISTRY_PASSWORD', value: build.token, public: false },
{ key: 'CI_REPOSITORY_URL', value: build.repo_url, public: false }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment